evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mdss: mdp: remove the mdss clock vote in case of error

Browse source 
While applying dynamic refresh rate, there is a possibility of
failure to apply new refresh rate and has to release all resources
acquired. Remove the clock vote in the case of failure to
apply new refresh rate.

Change-Id: I882b51a94499b1984b10b176ed9dac3daf595d81
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
This commit is contained in:
Jeevan Shriram 2014-06-26 10:28:15 -07:00 • committed by David Keitel
parent 1df1a1a1fd
commit 1b769308cc
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/video/fbdev/msm/mdss_mdp_intf_video.c
View file

@ -649,23 +649,20 @@ static int mdss_mdp_video_config_fps(struct mdss_mdp_ctl *ctl,
pr_err("Too few lines left line_cnt=%d yres/2=%d",
line_cnt,
pdata->panel_info.yres/2);
spin_unlock_irqrestore(&ctx->dfps_lock, flags);
return -EPERM;
rc = -EPERM;
goto exit_dfps;
}
rc = mdss_mdp_video_vfp_fps_update(ctl, new_fps);
if (rc < 0) {
pr_err("%s: Error during DFPS\n", __func__);
spin_unlock_irqrestore(&ctx->dfps_lock, flags);
return rc;
goto exit_dfps;
}
if (sctl) {
rc = mdss_mdp_video_vfp_fps_update(sctl,
new_fps);
if (rc < 0) {
pr_err("%s: DFPS error\n", __func__);
spin_unlock_irqrestore(&ctx->dfps_lock,
flags);
return rc;
goto exit_dfps;
}
}
rc = mdss_mdp_ctl_intf_event(ctl,
@ -673,6 +670,7 @@ static int mdss_mdp_video_config_fps(struct mdss_mdp_ctl *ctl,
(void *) (unsigned long) new_fps);
WARN(rc, "intf %d panel fps update error (%d)\n",
ctl->intf_num, rc);
exit_dfps:
spin_unlock_irqrestore(&ctx->dfps_lock, flags);
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
} else {