Commit 538e0110 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-11-13' of... 

Merge tag 'drm-intel-fixes-2025-11-13' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Fix PSR's pipe to vblank conversion (Jani)
- Disable Panel Replay on MST links (Imre)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/aRXdQnitzyFcokhF@intel.com
parents 15ebea1b f2687d3c

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

+6 −1
Original line number Diff line number Diff line
@@ -585,6 +585,10 @@ static void _panel_replay_init_dpcd(struct intel_dp *intel_dp) 
	struct intel_display *display = to_intel_display(intel_dp);

	int ret;



	/* TODO: Enable Panel Replay on MST once it's properly implemented. */

	if (intel_dp->mst_detect == DRM_DP_MST)

		return;



	ret = drm_dp_dpcd_read_data(&intel_dp->aux, DP_PANEL_REPLAY_CAP_SUPPORT,

				    &intel_dp->pr_dpcd, sizeof(intel_dp->pr_dpcd));

	if (ret < 0)
@@ -888,7 +892,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) ||