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

Merge "msm: mdss: hdmi: skip pan_display during handoff"

Browse source
This commit is contained in:
Linux Build Service Account 2019-05-13 09:47:45 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8258c6a068
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* /*
* Core MDSS framebuffer driver. * Core MDSS framebuffer driver.
* *
* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved. * Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.
* Copyright (C) 2007 Google Incorporated * Copyright (C) 2007 Google Incorporated
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
@ -3507,16 +3507,19 @@ static int mdss_fb_pan_display(struct fb_var_screeninfo *var,
{ {
struct mdp_display_commit disp_commit; struct mdp_display_commit disp_commit;
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par; struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
struct mdss_data_type *mdata = mfd_to_mdata(mfd);
/* /*
* during mode switch through mode sysfs node, it will trigger a * Abort pan_display operations in following cases:
* 1. during mode switch through mode sysfs node, it will trigger a
* pan_display after switch. This assumes that fb has been adjusted, * pan_display after switch. This assumes that fb has been adjusted,
* however when using overlays we may not have the right size at this * however when using overlays we may not have the right size at this
* point, so it needs to go through PREPARE first. Abort pan_display * point, so it needs to go through PREPARE first.
* operations until that happens * 2. When the splash handoff is pending.
*/ */
if (mfd->switch_state != MDSS_MDP_NO_UPDATE_REQUESTED) { if ((mfd->switch_state != MDSS_MDP_NO_UPDATE_REQUESTED) ||
pr_debug("fb%d: pan_display skipped during switch\n", mdata->handoff_pending) {
pr_debug("fb%d: pan_display skipped during switch or handoff\n",
mfd->index); mfd->index);
return 0; return 0;
} }