diff options
| author | Xu Yang <yangxu@codeaurora.org> | 2017-04-06 15:27:12 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-22 06:04:34 -0700 |
| commit | cf1e29d56a1ccdbd12177efe730aec8596960f0e (patch) | |
| tree | 764c218d0b7343c5b1112e9347b9b033bc642b45 /drivers/video/fbdev/msm | |
| parent | 60be71604a84d2e047215cb702d6324379a353bb (diff) | |
msm: mdss: remove wait for vsync in display commit
Remove wait for vsync in display commit if both PCC and DDIC
need to update for external backlight feature.
Change-Id: I57aeb48acba24e0ca3fff21b1117e48fe452028b
Signed-off-by: Xu Yang <yangxu@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev/msm')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index c062de3c1e59..eeb30a4ceac5 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -5735,15 +5735,6 @@ static void mdss_mdp_force_border_color(struct mdss_mdp_ctl *ctl) ctl->mixer_right->params_changed++; } -static bool mdss_mdp_handle_backlight_extn(struct mdss_mdp_ctl *ctl) -{ - if (ctl->intf_type == MDSS_INTF_DSI && !ctl->is_video_mode && - ctl->mfd->bl_extn_level >= 0) - return true; - else - return false; -} - int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg, struct mdss_mdp_commit_cb *commit_cb) { @@ -5910,15 +5901,6 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg, if (ctl->ops.wait_pingpong && !mdata->serialize_wait4pp) mdss_mdp_display_wait4pingpong(ctl, false); - /* - * If backlight needs to change, wait for 1 vsync before setting - * PCC and kickoff - */ - if (mdss_mdp_handle_backlight_extn(ctl) && - ctl->ops.wait_for_vsync_fnc) { - ret = ctl->ops.wait_for_vsync_fnc(ctl); - } - /* Moved pp programming to post ping pong */ ATRACE_BEGIN("postproc_programming_deferred"); if (!ctl->is_video_mode && ctl->mfd && @@ -6077,10 +6059,10 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg, pr_warn("ctl %d error displaying frame\n", ctl->num); /* update backlight in commit */ - if (mdss_mdp_handle_backlight_extn(ctl)) { - if (ctl->mfd && !IS_CALIB_MODE_BL(ctl->mfd) && - (!ctl->mfd->ext_bl_ctrl || - !ctl->mfd->bl_level)) { + if (ctl->intf_type == MDSS_INTF_DSI && !ctl->is_video_mode && + ctl->mfd && ctl->mfd->bl_extn_level >= 0) { + if (!IS_CALIB_MODE_BL(ctl->mfd) && (!ctl->mfd->ext_bl_ctrl || + !ctl->mfd->bl_level)) { mutex_lock(&ctl->mfd->bl_lock); mdss_fb_set_backlight(ctl->mfd, ctl->mfd->bl_extn_level); |