Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c44165dd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dsi: avoid panel mode switch flag after deep sleep" into display-kernel.lnx.4.19

parents 80aed770 0cfa54e5

msm/dsi/dsi_drm.c

+2 −3
Original line number Diff line number Diff line
@@ -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)) &&