commit 5273486681ca16bd526c707cde8f14fd90f7dbe0
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 07 21:37:55 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 07 21:37:55 2013 -0800
tree 00d00b60922034ce7fdd147d8b4770c105019005
parent b1e99c3bcee47676642177c54c9d964713ab2009
parent 36186c3d954a037f87ab6780e88d2cfae78d4281

Merge "msm: mdss: Fix under run on HDMI on adb shell stop"

drivers/video/msm/mdss/mdss_mdp_intf_video.c

diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
index 7c79ceb..8f7905a 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
@@ -294,6 +294,7 @@
 	struct mdss_mdp_video_ctx *ctx;
 	struct mdss_mdp_vsync_handler *tmp, *handle;
 	int rc;
+	u32 frame_rate = 0;
 
 	pr_debug("stop ctl=%d\n", ctl->num);
 
@@ -313,6 +314,14 @@
 		WARN(rc, "intf %d blank error (%d)\n", ctl->intf_num, rc);
 
 		mdp_video_write(ctx, MDSS_MDP_REG_INTF_TIMING_ENGINE_EN, 0);
+		/* wait for at least one VSYNC on HDMI intf for proper TG OFF */
+		if (MDSS_INTF_HDMI == ctx->intf_type) {
+			frame_rate = mdss_panel_get_framerate
+					(&(ctl->panel_data->panel_info));
+			if (!(frame_rate >= 24 && frame_rate <= 240))
+				frame_rate = 24;
+			msleep((1000/frame_rate) + 1);
+		}
 		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
 		ctx->timegen_en = false;