Merge tag 'drm-intel-next-fixes-2026-01-22' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next

airlied · airlied · commit d2f618b8fe76 · 2026-01-23T10:04:08.000+10:00
- Don't enable Panel Replay on sink if globally disabled Signed-off-by: Dave Airlie <airlied@redhat.com> From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patch.msgid.link/aXHZjieG9PkFKjZ2@jlahtine-mobl
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -842,7 +842,12 @@ static void intel_psr_enable_sink(struct intel_dp *intel_dp,
 
 void intel_psr_panel_replay_enable_sink(struct intel_dp *intel_dp)
 {
-	if (CAN_PANEL_REPLAY(intel_dp))
+	/*
+	 * NOTE: We might want to trigger mode set when
+	 * disabling/enabling Panel Replay via debugfs interface to
+	 * ensure this bit is cleared/set accordingly.
+	 */
+	if (CAN_PANEL_REPLAY(intel_dp) && panel_replay_global_enabled(intel_dp))
 		drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG,
 				   DP_PANEL_REPLAY_ENABLE);
 }

Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,12 @@ static void intel_psr_enable_sink(struct intel_dp *intel_dp,`
`842`	`842`
`843`	`843`	`void intel_psr_panel_replay_enable_sink(struct intel_dp *intel_dp)`
`844`	`844`	`{`
`845`		`- if (CAN_PANEL_REPLAY(intel_dp))`
	`845`	`+ /*`
	`846`	`+ * NOTE: We might want to trigger mode set when`
	`847`	`+ * disabling/enabling Panel Replay via debugfs interface to`
	`848`	`+ * ensure this bit is cleared/set accordingly.`
	`849`	`+ */`
	`850`	`+ if (CAN_PANEL_REPLAY(intel_dp) && panel_replay_global_enabled(intel_dp))`
`846`	`851`	`drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG,`
`847`	`852`	`DP_PANEL_REPLAY_ENABLE);`
`848`	`853`	`}`