From: Erik Gilling <konkers@android.com>
Date: Tue, 21 Sep 2010 00:56:39 +0000 (-0700)
Subject: video: tegra: force blend update on enable/disable not suspend/resume
X-Git-Tag: firefly_0821_release~9833^2~208
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c3d04325143dfbfe920540d7ae89530e6e9b3dd;p=firefly-linux-kernel-4.4.55.git

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 0d0608d014b8..21c0c6b3b560 100644
--- 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;
 }