From: Ankit Nautiyal Date: Mon, 24 Mar 2025 13:32:36 +0000 (+0530) Subject: drm/i915/display: Move intel_psr_post_plane_update() at the later X-Git-Tag: v6.16-rc1~144^2~20^2~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c29a0dd8c6eae77f3d0addac78331d1a516dc39;p=thirdparty%2Flinux.git drm/i915/display: Move intel_psr_post_plane_update() at the later In intel_post_plane_update() there are things which might need to do vblank waits, so enabling PSR as early as we do now is simply counter-productive. Therefore move intel_psr_post_plane_update() at the last of intel_post_plane_update(). Signed-off-by: Ankit Nautiyal Suggested-by: Ville Syrjälä Reviewed-by: Jouni Högander Link: https://lore.kernel.org/r/20250324133248.4071909-5-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 ecd2ea00e7fdb..0410151a696c6 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1049,8 +1049,6 @@ static void intel_post_plane_update(struct intel_atomic_state *state, intel_atomic_get_new_crtc_state(state, crtc); enum pipe pipe = crtc->pipe; - intel_psr_post_plane_update(state, crtc); - intel_frontbuffer_flip(dev_priv, new_crtc_state->fb_bits); if (new_crtc_state->update_wm_post && new_crtc_state->hw.active) @@ -1079,6 +1077,8 @@ static void intel_post_plane_update(struct intel_atomic_state *state, if (audio_enabling(old_crtc_state, new_crtc_state)) intel_encoders_audio_enable(state, crtc); + + intel_psr_post_plane_update(state, crtc); } static void intel_post_plane_update_after_readout(struct intel_atomic_state *state,