From cf9c758d1482f06eda455c90bef4bcdcea289e9f Mon Sep 17 00:00:00 2001 From: Ravishangar Kalyanam Date: Wed, 30 May 2012 22:12:09 -0700 Subject: [PATCH] msm_fb: display: Flush pipe registers before staging for Mixer 0 or 1 For Mixer 2, register flush need not be called. Flushing is done only for pipes on mixer 0 and 1. Signed-off-by: Ravishangar Kalyanam Change-Id: I54758f79552790de2ad936703ba6140ac57b76c4 --- drivers/video/msm/mdp4_overlay.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/video/msm/mdp4_overlay.c b/drivers/video/msm/mdp4_overlay.c index 2a15506103a..1287743f7c0 100644 --- a/drivers/video/msm/mdp4_overlay.c +++ b/drivers/video/msm/mdp4_overlay.c @@ -3086,7 +3086,13 @@ int mdp4_overlay_play(struct fb_info *info, struct msmfb_overlay_data *req) mdp4_overlay_rgb_setup(pipe); /* rgb pipe */ } - mdp4_overlay_reg_flush(pipe, 1); + if (pipe->mixer_num != MDP4_MIXER2) { + if ((ctrl->panel_mode & MDP4_PANEL_DTV) || + (ctrl->panel_mode & MDP4_PANEL_LCDC) || + (ctrl->panel_mode & MDP4_PANEL_DSI_VIDEO)) + mdp4_overlay_reg_flush(pipe, 1); + } + mdp4_mixer_stage_up(pipe); if (pipe->mixer_num == MDP4_MIXER2) {