summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/hdmi.c
diff options
context:
space:
mode:
authorSumit Bhattacharya <sumitb@nvidia.com>2011-07-22 16:39:37 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:47:55 -0800
commite53d565c5d6884e5c78f3ee22b346bbb09e2d37d (patch)
tree4e50044af52deba62997b4d6a03ae11ae1665874 /drivers/video/tegra/dc/hdmi.c
parent2b9f40247dd9e7dd4e5ab159bfe433666f422042 (diff)
tegra: video: dc: Fix no audio after res. change
Avoid reseting eld_retrieved flag during tegra_dc_hdmi_disable(). It will ensure if tegra_dc_hdmi_disable() is called due to resolution change, cached eld data is used. It will be reset to zero if during hotplug HDMI driver fails to get valid eld data. Bug 854284 Original-Change-Id: I08c8f48eded0c6a469faf63d601f28627a71602f Reviewed-on: http://git-master/r/42599 Tested-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com> Rebase-Id: Rb9636052979360707443ecc151a758f574b03a21
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
-rw-r--r--drivers/video/tegra/dc/hdmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 528a14ba33c5..39b3379eda8b 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -746,6 +746,7 @@ static bool tegra_dc_hdmi_detect(struct tegra_dc *dc)
return true;
fail:
+ hdmi->eld_retrieved = false;
tegra_nvhdcp_set_plug(hdmi->nvhdcp, 0);
return false;
}
@@ -1603,7 +1604,6 @@ static void tegra_dc_hdmi_disable(struct tegra_dc *dc)
#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_SOR_AUDIO_HDA_PRESENSE_0);
#endif
- hdmi->eld_retrieved = false;
tegra_periph_reset_assert(hdmi->clk);
hdmi->clk_enabled = false;
clk_disable(hdmi->clk);