summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChao Xu <cxu@nvidia.com>2013-09-24 16:14:45 -0700
committerAjay Nandakumar <anandakumarm@nvidia.com>2013-10-03 19:17:27 +0530
commit2f5f9f06e41ace0bb9ff5da57922ee5f7ce82852 (patch)
treefdbee60423bcb0a0a2121155fdae3fc764a84088
parenta891be73981eeeb4152fd125e56aa8306e9cb825 (diff)
video: tegra: dc: Fix HDMI powergating issue
Setting DISPB connected state after pending HPD is handled so DC won't powergate DIPB accidentally. Bug 1364348 Change-Id: Ib71267a73c205d1957972d462987e8f4cb542712 Signed-off-by: Chao Xu <cxu@nvidia.com> Reviewed-on: http://git-master/r/278533 Reviewed-by: Automatic_Commit_Validation_User (cherry picked from commit d6bee34206954a33f3245dea13d39c35b5fb9a5f) Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
-rw-r--r--drivers/video/tegra/dc/hdmi.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index b7c6fb7f2d41..decd31f3702a 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -757,8 +757,15 @@ bool tegra_dc_hdmi_mode_filter(const struct tegra_dc *dc,
/* used by tegra_dc_probe() to detect hpd/hdmi status at boot */
static bool tegra_dc_hdmi_detect(struct tegra_dc *dc)
{
+ int hdmi_state;
+
hdmi_state_machine_set_pending_hpd();
/* result isn't used by dc */
+
+ hdmi_state = hdmi_state_machine_get_state();
+ if (hdmi_state != HDMI_STATE_DONE_DISABLED &&
+ hdmi_state != HDMI_STATE_RESET)
+ dc->connected = true;
return true;
}