From 11c85590a0a9c55b6c88ddd02bbdd5fb6fd0c30b Mon Sep 17 00:00:00 2001 From: codeworkx Date: Fri, 30 Aug 2019 09:28:28 +0200 Subject: [PATCH] Revert "Revert "msm: mdss: hdmi: skip pan_display during handoff"" This reverts commit ac0bcfe8813b995043802c97c00227c30aec30de. Change-Id: I5ed3edd4cdd4a5f8026ba1b5b71c21248f0b1fe7 --- drivers/video/fbdev/msm/mdss_fb.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index f05ba2210516..0319c577b139 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-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2008-2019, The Linux Foundation. All rights reserved. * Copyright (C) 2007 Google Incorporated * * This software is licensed under the terms of the GNU General Public @@ -3768,13 +3768,15 @@ 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); /* - * 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 + * 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. */ if ((mfd->switch_state != MDSS_MDP_NO_UPDATE_REQUESTED) || (mdss_fb_is_hdmi_primary(mfd) && mdata->handoff_pending)) {