summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Hiienkari <mhiienkari@nvidia.com>2013-04-08 17:47:40 +0300
committerManish Tuteja <mtuteja@nvidia.com>2014-01-14 10:56:53 -0800
commit2711d03dc2710fb412e0ec13ab152ca71c9620c0 (patch)
treea0ec6b74c391229e9227bc661d65fb245c4a149e
parent06f6d58036fdad608683b1f5c8c9f4865166c88d (diff)
tegra: dc: fix HDMI CMU enable.
Initialize HDMI CMU with same parameters as in DC init when enabling it subsequently. Bug 1162082 Bug 1407045 Change-Id: I25a7cfb75a43c49487a2a3ec7569aa89727dd4ab Signed-off-by: Markus Hiienkari <mhiienkari@nvidia.com> Reviewed-on: http://git-master/r/337980 Reviewed-on: http://git-master/r/353695 Tested-by: Sanjay Singh Chauhan <schauhan@nvidia.com> Reviewed-by: Thomas J. Meier <tmeier@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Michael I Gold <gold@nvidia.com> Reviewed-by: Xuezhou Ma <xuezhoum@nvidia.com>
-rw-r--r--drivers/video/tegra/dc/dc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 5805355c847c..c85b75ef5877 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -912,10 +912,14 @@ EXPORT_SYMBOL(tegra_dc_update_cmu);
void tegra_dc_cmu_enable(struct tegra_dc *dc, bool cmu_enable)
{
dc->pdata->cmu_enable = cmu_enable;
- if (dc->pdata->cmu)
+ if (dc->pdata->cmu) {
tegra_dc_update_cmu(dc, dc->pdata->cmu);
- else
- tegra_dc_update_cmu(dc, &default_cmu);
+ } else {
+ if (dc->out->type == TEGRA_DC_OUT_HDMI)
+ tegra_dc_update_cmu(dc, &default_limited_cmu);
+ else
+ tegra_dc_update_cmu(dc, &default_cmu);
+ }
}
#else
#define tegra_dc_cache_cmu(dst_cmu, src_cmu)