Skip to content

Commit b0a4dba

Browse files
hoganderjlahtine-intel
authored andcommitted
drm/i915/psr: Disable PSR on update_m_n and update_lrr
PSR/PR parameters might change based on update_m_n or update_lrr. Disable on update_m_n and update_lrr to ensure proper parameters are taken into use on next PSR enable in intel_psr_post_plane_update. Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15771 Fixes: 2bc98c6 ("drm/i915/alpm: Compute ALPM parameters into crtc_state->alpm_state") Cc: <[email protected]> # v6.19+ Signed-off-by: Jouni Högander <[email protected]> Reviewed-by: Suraj Kandpal <[email protected]> Link: https://patch.msgid.link/[email protected] (cherry picked from commit 65852b5) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent ac57eb3 commit b0a4dba

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/gpu/drm/i915/display/intel_psr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3109,6 +3109,8 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state,
31093109
* - Display WA #1136: skl, bxt
31103110
*/
31113111
if (intel_crtc_needs_modeset(new_crtc_state) ||
3112+
new_crtc_state->update_m_n ||
3113+
new_crtc_state->update_lrr ||
31123114
!new_crtc_state->has_psr ||
31133115
!new_crtc_state->active_planes ||
31143116
new_crtc_state->has_sel_update != psr->sel_update_enabled ||

0 commit comments

Comments
 (0)