From: Ankit Nautiyal Date: Mon, 24 Mar 2025 13:32:35 +0000 (+0530) Subject: drm/i915/display: Disable PSR before disabling VRR X-Git-Tag: v6.16-rc1~144^2~20^2~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b68938364b6fa528d5ae1cd2ffbcd95880bff19;p=thirdparty%2Flinux.git drm/i915/display: Disable PSR before disabling VRR As per bspec 49268: Disable PSR before disabling VRR. Signed-off-by: Ankit Nautiyal Reviewed-by: Ville Syrjälä Link: https://lore.kernel.org/r/20250324133248.4071909-4-ankit.k.nautiyal@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 48282611db3e3..ecd2ea00e7fdb 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -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);