From patchwork Mon Feb 20 21:03:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 6843 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6CC6423ECA for ; Mon, 20 Feb 2012 21:03:41 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2F538A184DB for ; Mon, 20 Feb 2012 21:03:41 +0000 (UTC) Received: by iabz7 with SMTP id z7so11197124iab.11 for ; Mon, 20 Feb 2012 13:03:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:x-forwarded-to:x-forwarded-for:delivered-to :received-spf:received-spf:dkim-signature:sender:from:to:cc:subject :date:message-id:x-mailer; bh=7KzEkgl8cyGV0cfiY3JkEnun+k2wxerb7Q8ko7Qph/E=; b=wIvRkVahKR2soiqid5am1BxzQTThs5qe23pbq+ziN3le+eWlEyYJS5Dc5rZtjg+pJG nghpZ1TAxgONRQ9s0rzkRFW3YNsdxtxgCbJyYj2gExymBnlcxkUsXrgIk4KdSmXGg5zM 08JeAyKBc9Q1rDeNfMm4cCWaq4TMmq9s5ts1Q= MIME-Version: 1.0 Received: by 10.50.34.202 with SMTP id b10mr12373478igj.30.1329771820646; Mon, 20 Feb 2012 13:03:40 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp60319ibr; Mon, 20 Feb 2012 13:03:39 -0800 (PST) Received: by 10.236.79.202 with SMTP id i50mr24244930yhe.61.1329771819458; Mon, 20 Feb 2012 13:03:39 -0800 (PST) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id e8si2255946ano.26.2012.02.20.13.03.39 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Feb 2012 13:03:39 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by yenm12 with SMTP id m12so3221658yen.37 for ; Mon, 20 Feb 2012 13:03:39 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 10.236.201.195 as permitted sender) client-ip=10.236.201.195; Received: from mr.google.com ([10.236.201.195]) by 10.236.201.195 with SMTP id b43mr30620298yho.75.1329771819227 (num_hops = 1); Mon, 20 Feb 2012 13:03:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=7KzEkgl8cyGV0cfiY3JkEnun+k2wxerb7Q8ko7Qph/E=; b=wPXCoaKywYmsXr1u2ntx9ZBQxoSfxjb5uvBbkAabZJSwhQQUh4o4zoKyZcAitevPo/ Mfsh9Z/urQv5UlWfBllAf/dl4xqwEwI4xlsEZiqgBerlRZQbKXzff0C/QCpheWSolKAq b4OOu50apORF3QS3FlxgesjS5d/vKFiZU8pB8= Received: by 10.236.201.195 with SMTP id b43mr23677986yho.75.1329771819150; Mon, 20 Feb 2012 13:03:39 -0800 (PST) Received: from localhost (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id g23sm5272716ann.9.2012.02.20.13.03.38 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Feb 2012 13:03:38 -0800 (PST) Sender: Rob Clark From: Rob Clark To: linux-omap@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Tomi Valkeinen , Rob Clark Subject: [PATCH] OMAPDSS: HDMI: hot plug detect fix Date: Mon, 20 Feb 2012 15:03:36 -0600 Message-Id: <1329771816-21130-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQnGUzsIlrKLIKfr7xJuL5mSDM9tQjz3BsKCbNgqCQIztdfo1uju/ElmyfS3ByYuMDIDwBwE From: Rob Clark The "OMAPDSS: HDMI: PHY burnout fix" commit switched the HDMI driver over to using a GPIO for plug detect. Unfortunately the ->detect() method was not also updated, causing HDMI to no longer work for the omapdrm driver (because it would actually check if a connection was detected before attempting to enable display). Signed-off-by: Rob Clark --- drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c index 2d72334..6847a47 100644 --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c @@ -479,14 +479,7 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data) { - int r; - - void __iomem *base = hdmi_core_sys_base(ip_data); - - /* HPD */ - r = REG_GET(base, HDMI_CORE_SYS_SYS_STAT, 1, 1); - - return r == 1; + return gpio_get_value(ip_data->hpd_gpio); } static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,