Merge "video: msm: Move histogram disable to before panel off" into msm-3.4
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 */
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 */