From 65638ab69cb7dee35571ae4626d98e05f9b646b4 Mon Sep 17 00:00:00 2001 From: raghavendra ambadas Date: Tue, 16 Jul 2019 10:24:16 +0530 Subject: [PATCH] fbdev: msm: check for hdmi as primary skip pan display operation if found hdmi as primary and handoff is pending. This check will help pan display path to execute for primary display in recovery mode. Change-Id: Iedd7e6b98f62d3a0d5b9cdda4ba4591ed8bfac68 Signed-off-by: Raghavendra Ambadas --- drivers/video/fbdev/msm/mdss_fb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 002106b80ff1..f05ba2210516 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -3776,8 +3776,9 @@ static int mdss_fb_pan_display(struct fb_var_screeninfo *var, * 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) { - pr_debug("fb%d: pan_display skipped during switch\n", + if ((mfd->switch_state != MDSS_MDP_NO_UPDATE_REQUESTED) || + (mdss_fb_is_hdmi_primary(mfd) && mdata->handoff_pending)) { + pr_debug("fb%d: pan_display skipped during switch or handoff\n", mfd->index); return 0; }