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 c70f7f84835770c9af88189c4b4bbeb3c8e19729..fc4f3fed09f4f59eb0aed2adb0b170d341de6d2c 100644 (file)
--- 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);
 }