Commit d2f618b8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2026-01-22' of... 

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

 into drm-next

- Don't enable Panel Replay on sink if globally disabled

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patch.msgid.link/aXHZjieG9PkFKjZ2@jlahtine-mobl
parents d62dec8c 69f83f16

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

+6 −1
Original line number Diff line number Diff line
@@ -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);

}