commit d15a4833174cf14345d9179750ec50aa8521dade
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 29 11:03:15 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 29 11:03:14 2012 -0700
tree 51dfa765d425d6a8afeb2ab0c41a8de1fe12ff4c
parent 41da986b8b8b3923ac005ea52e35b9e0127225ba
parent 6ba5f1fb067410d097f973f311bfcc9eded6a1bb

Merge "msm_fb: display: add wait4dmae for hdmi as primary display"

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 67690cf..e71f49f 100644
--- a/drivers/video/msm/mdp4_overlay_dtv.c
+++ b/drivers/video/msm/mdp4_overlay_dtv.c
@@ -1114,6 +1114,7 @@
 	int cndx = 0;
 	struct vsycn_ctrl *vctrl;
 	struct mdp4_overlay_pipe *pipe;
+	int wait = 0;
 
 	mutex_lock(&mfd->dma->ov_mutex);
 	if (!mfd->panel_power_on) {
@@ -1145,8 +1146,12 @@
 		mdp4_dtv_pipe_queue(0, pipe);
 	}
 	mdp_update_pm(mfd, vsync_ctrl_db[0].vsync_time);
+
+	if (hdmi_prim_display)
+		wait = 1;
+
 	mdp4_overlay_mdp_perf_upd(mfd, 1);
-	mdp4_dtv_pipe_commit(cndx, 0);
+	mdp4_dtv_pipe_commit(cndx, wait);
 	mdp4_overlay_mdp_perf_upd(mfd, 0);
 	mutex_unlock(&mfd->dma->ov_mutex);
 }