video: tegra: dc: apply CMU changes only if active

Bug 1189604

Change-Id: I2f80ba92137a8a9153dad00fa3afea7ce4a1b0a1
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/168912
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index abe912e5707d18dbda59dab8e236e349f88505b5..4ddd9798273dec75c28737ced1a4c2a93483d198 100644 (file)
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -879,6 +879,10 @@ int tegra_dc_update_cmu(struct tegra_dc *dc, struct tegra_dc_cmu *cmu)
        int ret;
 
        mutex_lock(&dc->lock);
+       if (!dc->enabled) {
+               mutex_unlock(&dc->lock);
+               return 0;
+       }
        tegra_dc_io_start(dc);
        tegra_dc_hold_dc_out(dc);