From: Yakir Yang <ykk@rock-chips.com>
To: Heiko Stuebner <heiko@sntech.de>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Fabio Estevam <fabio.estevam@freescale.com>,
Jingoo Han <jingoohan1@gmail.com>,
Inki Dae <inki.dae@samsung.com>
Cc: djkurtz@google.com, dianders@google.com,
Takashi Iwai <tiwai@suse.de>, Andrzej Hajda <a.hajda@samsung.com>,
Yakir Yang <ykk@rock-chips.com>,
Thierry Reding <treding@nvidia.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
David Airlie <airlied@linux.ie>,
Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
Seung-Woo Kim <sw0312.kim@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Ajay Kumar <ajaykumar.rs@samsung.com>,
Joonyoung Shim <jy0922.shim@samsung.com>,
Vincent Palatin <vpalatin@chromium.org>,
Mark Yao <mark.yao@rock-chips.com>,
Andy Yan <andy.yan@rock-chips.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-samsung-soc@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 7/8] drm: bridge: analogix_dp: try force hpd after plug in lookup failed
Date: Thu, 6 Aug 2015 09:24:18 -0500 [thread overview]
Message-ID: <1438871058-24005-1-git-send-email-ykk@rock-chips.com> (raw)
In-Reply-To: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
Some edp screen do not have hpd signal, so we can't just return
failed when hpd plug in detect failed.
Besides TRM indicate that if HPD_STATUS(RO) is 0, AUX CH will not
work, so we need to give a force hpd action to set HPD_STATUS manually.
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
drivers/gpu/drm/bridge/analogix_dp_core.c | 28 +++++++++++++++++++++++-----
drivers/gpu/drm/bridge/analogix_dp_core.h | 1 +
drivers/gpu/drm/bridge/analogix_dp_reg.c | 9 +++++++++
3 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix_dp_core.c
index 28724d4..7e67f19 100644
--- a/drivers/gpu/drm/bridge/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix_dp_core.c
@@ -68,15 +68,33 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
{
int timeout_loop = 0;
- while (analogix_dp_get_plug_in_status(dp) != 0) {
+ while (timeout_loop < DP_TIMEOUT_LOOP_COUNT) {
+ if (analogix_dp_get_plug_in_status(dp) == 0)
+ return 0;
+
timeout_loop++;
- if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {
- dev_err(dp->dev, "failed to get hpd plug status\n");
- return -ETIMEDOUT;
- }
usleep_range(10, 11);
}
+ /*
+ * Some edp screen do not have hpd signal, so we can't just
+ * return failed when hpd plug in detect failed.
+ *
+ * Besides TRM indicate that if HPD_STATUS(RO) is 0, AUX CH
+ * will not work, so we need to give a force hpd action to
+ * set HPD_STATUS manually.
+ */
+ dev_dbg(dp->dev, "failed to get hpd plug status, try to force hpd\n");
+
+ analogix_dp_force_hpd(dp);
+
+ if (analogix_dp_get_plug_in_status(dp) != 0) {
+ dev_err(dp->dev, "failed to get hpd plug in status\n");
+ return -ETIMEDOUT;
+ }
+
+ dev_dbg(dp->dev, "success to get plug in status after force hpd\n");
+
return 0;
}
diff --git a/drivers/gpu/drm/bridge/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix_dp_core.h
index fe72695..43cec77 100644
--- a/drivers/gpu/drm/bridge/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix_dp_core.h
@@ -183,6 +183,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
bool enable);
void analogix_dp_init_analog_func(struct analogix_dp_device *dp);
void analogix_dp_init_hpd(struct analogix_dp_device *dp);
+void analogix_dp_force_hpd(struct analogix_dp_device *dp);
enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp);
void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp);
void analogix_dp_reset_aux(struct analogix_dp_device *dp);
diff --git a/drivers/gpu/drm/bridge/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix_dp_reg.c
index 4d6e08a..3fb215b 100644
--- a/drivers/gpu/drm/bridge/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix_dp_reg.c
@@ -366,6 +366,15 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp)
writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
}
+void analogix_dp_force_hpd(struct analogix_dp_device *dp)
+{
+ u32 reg;
+
+ reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ reg = (F_HPD | HPD_CTRL);
+ writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+}
+
enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp)
{
u32 reg;
--
2.1.2
next prev parent reply other threads:[~2015-08-06 14:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-06 13:49 [RFC PATCH 0/8] Add Analogix Core Display Port Driver Yakir Yang
2015-08-06 13:58 ` [RFC PATCH 1/8] drm: exynos/dp: fix code style Yakir Yang
2015-08-06 14:04 ` Yakir Yang
2015-08-06 15:05 ` Joe Perches
2015-08-06 15:20 ` Yakir Yang
2015-08-06 14:07 ` [RFC PATCH 2/8] drm: exynos/dp: convert to drm bridge mode Yakir Yang
2015-08-06 14:19 ` Jingoo Han
2015-08-06 14:29 ` Yakir Yang
2015-08-07 11:25 ` Daniel Vetter
2015-08-07 13:18 ` Yakir Yang
2015-08-06 14:19 ` [RFC PATCH 3/8] drm: bridge: analogix_dp: split exynos dp driver to bridge dir Yakir Yang
2015-08-06 14:33 ` Jingoo Han
2015-08-06 14:57 ` Yakir Yang
2015-08-06 14:19 ` [RFC PATCH 4/8] drm: rockchip/dp: add rockchip platform dp driver Yakir Yang
2015-08-06 14:19 ` [RFC PATCH 5/8] drm: bridge/analogix_dp: add platform device type support Yakir Yang
2015-08-06 14:22 ` [RFC PATCH 6/8] drm: bridge: analogix_dp: add some rk3288 special registers setting Yakir Yang
2015-08-06 14:24 ` Yakir Yang [this message]
2015-08-06 14:26 ` [RFC PATCH 8/8] drm: bridge/analogix_dp: expand the delay time for hpd detect Yakir Yang
2015-08-06 14:41 ` [RFC PATCH 0/8] Add Analogix Core Display Port Driver Jingoo Han
2015-08-06 15:00 ` Yakir Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438871058-24005-1-git-send-email-ykk@rock-chips.com \
--to=ykk@rock-chips.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=ajaykumar.rs@samsung.com \
--cc=andy.yan@rock-chips.com \
--cc=dianders@google.com \
--cc=djkurtz@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fabio.estevam@freescale.com \
--cc=gustavo.padovan@collabora.co.uk \
--cc=heiko@sntech.de \
--cc=inki.dae@samsung.com \
--cc=jingoohan1@gmail.com \
--cc=jy0922.shim@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=mark.yao@rock-chips.com \
--cc=p.zabel@pengutronix.de \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=sw0312.kim@samsung.com \
--cc=tiwai@suse.de \
--cc=treding@nvidia.com \
--cc=vpalatin@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®