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

Merge "msm: mdss: change retire fence signaling"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-30 06:27:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 36d9d0f8f4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/fbdev/msm/mdss_fb.c
View file

@ -3076,7 +3076,7 @@ static int mdss_fb_pan_display_ex(struct fb_info *info,
if (var->yoffset > (info->var.yres_virtual - info->var.yres)) if (var->yoffset > (info->var.yres_virtual - info->var.yres))
return -EINVAL; return -EINVAL;
ret = mdss_fb_wait_for_kickoff(mfd); ret = mdss_fb_pan_idle(mfd);
if (ret) { if (ret) {
pr_err("wait_for_kick failed. rc=%d\n", ret); pr_err("wait_for_kick failed. rc=%d\n", ret);
return ret; return ret;

2
drivers/video/fbdev/msm/mdss_mdp_overlay.c
View file

@ -2325,7 +2325,6 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd,
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON); mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
mdss_mdp_check_ctl_reset_status(ctl); mdss_mdp_check_ctl_reset_status(ctl);
__vsync_set_vsync_handler(mfd);
__validate_and_set_roi(mfd, data); __validate_and_set_roi(mfd, data);
if (ctl->ops.wait_pingpong && mdp5_data->mdata->serialize_wait4pp) if (ctl->ops.wait_pingpong && mdp5_data->mdata->serialize_wait4pp)
@ -2374,6 +2373,7 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd,
&commit_cb); &commit_cb);
ATRACE_END("display_commit"); ATRACE_END("display_commit");
} }
__vsync_set_vsync_handler(mfd);
/* /*
* release the commit pending flag; we are releasing this flag * release the commit pending flag; we are releasing this flag