commit 6b01c68daace8c92c13a831e44d92c025cf22539
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 21 10:28:12 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Aug 21 10:28:12 2012 -0700
tree 750b94eceb433c7d2d000632d80a676862f51b6a
parent 2163f5f933cb185b8243da1b77ebcfbbe3b766f9
parent 67ddb9b38b1793c297ff431ef9f650f355c4abf2

Merge "video: msm: Move histogram disable to before panel off" into msm-3.4

drivers/video/msm/mdp4_overlay_dsi_video.c

diff --git a/drivers/video/msm/mdp4_overlay_dsi_video.c b/drivers/video/msm/mdp4_overlay_dsi_video.c
index 40ffac4..cf9e635 100644
--- a/drivers/video/msm/mdp4_overlay_dsi_video.c
+++ b/drivers/video/msm/mdp4_overlay_dsi_video.c
@@ -651,12 +651,12 @@
 	while (vctrl->wait_vsync_cnt)
 		msleep(20);	/* >= 17 ms */
 
+	mdp_histogram_ctrl_all(FALSE);
+
 	MDP_OUTP(MDP_BASE + DSI_VIDEO_BASE, 0);
 
 	dsi_video_enabled = 0;
 
-	mdp_histogram_ctrl_all(FALSE);
-
 	if (pipe) {
 		if (mfd->ref_cnt == 0) {
 			/* adb stop */

drivers/video/msm/mdp4_overlay_lcdc.c

diff --git a/drivers/video/msm/mdp4_overlay_lcdc.c b/drivers/video/msm/mdp4_overlay_lcdc.c
index 4a478cd..e10d795 100644
--- a/drivers/video/msm/mdp4_overlay_lcdc.c
+++ b/drivers/video/msm/mdp4_overlay_lcdc.c
@@ -640,12 +640,12 @@
 	while (vctrl->wait_vsync_cnt)
 		msleep(20);	/* >= 17 ms */
 
+	mdp_histogram_ctrl_all(FALSE);
+
 	MDP_OUTP(MDP_BASE + LCDC_BASE, 0);
 
 	lcdc_enabled = 0;
 
-	mdp_histogram_ctrl_all(FALSE);
-
 	if (pipe) {
 		if (mfd->ref_cnt == 0) {
 			/* adb stop */