From 0cfa54e5032194043e85389e89b1d9cd27ba788e Mon Sep 17 00:00:00 2001 From: Samantha Tran Date: Wed, 22 May 2019 11:16:05 -0700 Subject: [PATCH] disp: msm: dsi: avoid panel mode switch flag after deep sleep This change updates the checks needed before setting the flag to enable panel switching between command and video mode. New crtc active state remains disabled and it causes a failure in the previous case. Change-Id: I059731d2faa0f7844d3784fcf7694509fbba3ff7 Signed-off-by: Samantha Tran --- msm/dsi/dsi_drm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/msm/dsi/dsi_drm.c b/msm/dsi/dsi_drm.c index 26064cc4c4e2..6d5c25887f3c 100644 --- a/msm/dsi/dsi_drm.c +++ b/msm/dsi/dsi_drm.c @@ -390,10 +390,9 @@ static bool dsi_bridge_mode_fixup(struct drm_bridge *bridge, /* No panel mode switch when drm pipeline is changing */ if ((dsi_mode.panel_mode != cur_dsi_mode.panel_mode) && (!(dsi_mode.dsi_mode_flags & DSI_MODE_FLAG_VRR)) && - (!crtc_state->active_changed || - display->is_cont_splash_enabled)) + (crtc_state->enable == + crtc_state->crtc->state->enable)) dsi_mode.dsi_mode_flags |= DSI_MODE_FLAG_POMS; - /* No DMS/VRR when drm pipeline is changing */ if (!drm_mode_equal(&cur_mode, adjusted_mode) && (!(dsi_mode.dsi_mode_flags & DSI_MODE_FLAG_VRR)) &&