video: tegra: force blend update on enable/disable not suspend/resume

Change-Id: I2d47d820311554b29db302ab9370574f2112cb51
Signed-off-by: Erik Gilling <konkers@android.com>

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 0d0608d014b8b8d28e9bca21a73cee11366d8b56..21c0c6b3b56041f428b9e75613b901f6b84474d0 100644 (file)
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -729,6 +729,9 @@ static void _tegra_dc_enable(struct tegra_dc *dc)
 
        if (dc->out_ops && dc->out_ops->enable)
                dc->out_ops->enable(dc);
+
+       /* force a full blending update */
+       dc->blend.z[0] = -1;
 }
 
 void tegra_dc_enable(struct tegra_dc *dc)
@@ -958,20 +961,11 @@ static int tegra_dc_suspend(struct nvhost_device *ndev, pm_message_t state)
 static int tegra_dc_resume(struct nvhost_device *ndev)
 {
        struct tegra_dc *dc = nvhost_get_drvdata(ndev);
-       struct tegra_dc_win *wins[DC_N_WINDOWS];
-       int i;
 
        dev_info(&ndev->dev, "resume\n");
 
-       if (dc->enabled) {
-               for (i = 0; i < dc->n_windows; i++)
-                       wins[i] = &dc->windows[i];
-
+       if (dc->enabled)
                _tegra_dc_enable(dc);
-               /* force a full blending update */
-               dc->blend.z[0] = -1;
-               tegra_dc_update_windows(wins, dc->n_windows);
-       }
 
        return 0;
 }