Commit 8b689383 authored by Ankit Nautiyal's avatar Ankit Nautiyal
Browse files

drm/i915/display: Disable PSR before disabling VRR

parent 5e25f996
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1174,6 +1174,8 @@ static void intel_pre_plane_update(struct intel_atomic_state *state,
		intel_atomic_get_new_crtc_state(state, crtc);
	enum pipe pipe = crtc->pipe;

	intel_psr_pre_plane_update(state, crtc);

	if (intel_crtc_vrr_disabling(state, crtc)) {
		intel_vrr_disable(old_crtc_state);
		intel_crtc_update_active_timings(old_crtc_state, false);
@@ -1184,8 +1186,6 @@ static void intel_pre_plane_update(struct intel_atomic_state *state,

	intel_drrs_deactivate(old_crtc_state);

	intel_psr_pre_plane_update(state, crtc);

	if (hsw_ips_pre_update(state, crtc))
		intel_crtc_wait_for_next_vblank(crtc);