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

Merge "msm: mdss: Signal outstanding fences when panel is dead"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-16 01:56:02 -07:00 • committed by Gerrit - the friendly Code Review server
commit a3343e7061
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4661,6 +4661,7 @@ static int mdss_fb_atomic_commit_ioctl(struct fb_info *info,
struct mdp_destination_scaler_data *ds_data = NULL;
struct mdp_destination_scaler_data __user *ds_data_user;
struct msm_fb_data_type *mfd;
struct mdss_overlay_private *mdp5_data = NULL;
ret = copy_from_user(&commit, argp, sizeof(struct mdp_layer_commit));
if (ret) {
@ -4672,9 +4673,20 @@ static int mdss_fb_atomic_commit_ioctl(struct fb_info *info,
if (!mfd)
return -EINVAL;
mdp5_data = mfd_to_mdp5_data(mfd);
if (mfd->panel_info->panel_dead) {
pr_debug("early commit return\n");
MDSS_XLOG(mfd->panel_info->panel_dead);
/*
* In case of an ESD attack, since we early return from the
* commits, we need to signal the outstanding fences.
*/
mdss_fb_release_fences(mfd);
if ((mfd->panel.type == MIPI_CMD_PANEL) &&
mfd->mdp.signal_retire_fence && mdp5_data)
mfd->mdp.signal_retire_fence(mfd,
mdp5_data->retire_cnt);
return 0;
}