From: Erik Gilling <konkers@android.com>
Date: Fri, 17 Sep 2010 22:43:47 +0000 (-0700)
Subject: video: tegra: drain syncpt waits on display disable
X-Git-Tag: firefly_0821_release~9834^2~546
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a2f6d372abf08c765a061a5a7a746724f503269;p=firefly-linux-kernel-4.4.55.git

video: tegra: drain syncpt waits on display disable

Change-Id: I815c7be652f03b7d675200918b258950b49795d3
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 c70f7f848357..fc4f3fed09f4 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -849,6 +849,12 @@ static void _tegra_dc_disable(struct tegra_dc *dc)
 	if (dc->out && dc->out->disable)
 		dc->out->disable();
 
+	/* flush any pending syncpt waits */
+	while (dc->syncpt_min < dc->syncpt_max) {
+		dc->syncpt_min++;
+		nvhost_syncpt_cpu_incr(&dc->ndev->host->syncpt, dc->syncpt_id);
+	}
+
 	tegra_dc_io_end(dc);
 }