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