commit dfed8d01e2eadafc8b92b837933d4ea9f6fd4dc8
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 27 14:53:29 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri Jul 27 14:53:29 2012 -0700
tree 0b952380ac7af26ffe19cb52524f21f0a619e519
parent 3b8beddd9c9bbdbda6ebcdb73165a73734785b50
parent 43da18d00abc2a61834b6650a49bf7edcf4f4df0

Merge "msm_fb: display: switch blt mode on/off without turning off TG" into msm-3.4

drivers/video/msm/mdp4_overlay_dtv.c

diff --git a/drivers/video/msm/mdp4_overlay_dtv.c b/drivers/video/msm/mdp4_overlay_dtv.c
index b9d6037..3ba4c7d 100644
--- a/drivers/video/msm/mdp4_overlay_dtv.c
+++ b/drivers/video/msm/mdp4_overlay_dtv.c
@@ -672,15 +672,19 @@
 	if (!change)
 		return;
 
-	if (dtv_enabled) {
+	if (dtv_enabled)
 		mdp4_overlay_dtv_wait4dmae(mfd);
-		MDP_OUTP(MDP_BASE + DTV_BASE, 0);	/* stop dtv */
-		msleep(20);
-	}
 
-	mdp4_overlay_dmae_xy(dtv_pipe);
-	mdp4_overlayproc_cfg(dtv_pipe);
-	MDP_OUTP(MDP_BASE + DTV_BASE, 1);	/* start dtv */
+	while (inpdw(MDP_BASE + 0x0018) & 0x12)
+		;
+
+	if (enable) {
+		mdp4_overlayproc_cfg(dtv_pipe);
+		mdp4_overlay_dmae_xy(dtv_pipe);
+	} else {
+		mdp4_overlay_dmae_xy(dtv_pipe);
+		mdp4_overlayproc_cfg(dtv_pipe);
+	}
 }
 
 void mdp4_dtv_overlay_blt_start(struct msm_fb_data_type *mfd)