Unverified Commit 994dec10 authored by Jani Nikula's avatar Jani Nikula Committed by Rodrigo Vivi
Browse files

drm/i915/psr: fix pipe to vblank conversion 



First, we can't assume pipe == crtc index. If a pipe is fused off in
between, it no longer holds. intel_crtc_for_pipe() is the only proper
way to get from a pipe to the corresponding crtc.

Second, drivers aren't supposed to access or index drm->vblank[]
directly. There's drm_crtc_vblank_crtc() for this.

Use both functions to fix the pipe to vblank conversion.

Fixes: f02658c4 ("drm/i915/psr: Add mechanism to notify PSR of pipe enable/disable")
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: stable@vger.kernel.org # v6.16+
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/20251106200000.1455164-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
(cherry picked from commit 2750f676)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent e9a6fb0b

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

+2 −1
Original line number Diff line number Diff line
@@ -888,7 +888,8 @@ static bool is_dc5_dc6_blocked(struct intel_dp *intel_dp) 
{

	struct intel_display *display = to_intel_display(intel_dp);

	u32 current_dc_state = intel_display_power_get_current_dc_state(display);

	struct drm_vblank_crtc *vblank = &display->drm->vblank[intel_dp->psr.pipe];

	struct intel_crtc *crtc = intel_crtc_for_pipe(display, intel_dp->psr.pipe);

	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);



	return (current_dc_state != DC_STATE_EN_UPTO_DC5 &&

		current_dc_state != DC_STATE_EN_UPTO_DC6) ||