From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gaggery Tsai Date: Tue, 8 Apr 2026 15:00:00 -0700 Subject: [PATCH] drm/i915/psr: Allow PSR with VRR on Panther Lake The blanket VRR rejection in _psr_compute_config() prevents PSR2 from coexisting with VRR on all platforms. On Panther Lake (PTL, DISPLAY_VER 30), PSR2 + VRR has been tested and works correctly. The existing Wa_16011303918 in intel_psr2_config_valid() already handles the Alderlake-P stepping-specific VRR incompatibility. Remove the blanket check to allow PSR2 + VRR on platforms where no specific workaround applies. Signed-off-by: Gaggery Tsai --- diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 197c238..242077f 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1714,12 +1714,6 @@ static bool _psr_compute_config(struct intel_dp *intel_dp, if (!CAN_PSR(intel_dp) || !display->params.enable_psr) return false; - /* - * Currently PSR doesn't work reliably with VRR enabled. - */ - if (crtc_state->vrr.enable) - return false; - entry_setup_frames = intel_psr_entry_setup_frames(intel_dp, conn_state, adjusted_mode); if (entry_setup_frames >= 0) {