diff options
| author | Markus Hiienkari <mhiienkari@nvidia.com> | 2013-04-08 17:47:40 +0300 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-12-16 01:45:29 -0800 |
| commit | b213ac70e1401be27ead44fc3f49b1edc8e5748e (patch) | |
| tree | f1740b726c22a27a6204ec23d3a3d238173d8822 | |
| parent | f9b6903890cf41ed8569c48eddf00f349ba12293 (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-by: Automatic_Commit_Validation_User
Reviewed-by: Thomas J. Meier <tmeier@nvidia.com>
Reviewed-by: Xuezhou Ma <xuezhoum@nvidia.com>
Reviewed-by: David Dastous St Hilaire <ddastoussthi@nvidia.com>
Tested-by: David Dastous St Hilaire <ddastoussthi@nvidia.com>
Reviewed-by: Michael I Gold <gold@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 10 |
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) |