From: Jouni Högander Date: Thu, 13 Feb 2025 11:16:28 +0000 (+0200) Subject: drm/i915/psr: Fix drm_WARN_ON in intel_psr_disable X-Git-Tag: v6.15-rc1~120^2~16^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89eb319aab83c76ffa5096d533bef3905e6e3051;p=thirdparty%2Flinux.git drm/i915/psr: Fix drm_WARN_ON in intel_psr_disable Currently intel_psr_disable is dumping out warning if PSR is not supported. On monitor supporting only Panel Replay we are seeing this warning. Fix this by checking Panel Replay support as well. Signed-off-by: Jouni Högander Reviewed-by: Suraj Kandpal Link: https://patchwork.freedesktop.org/patch/msgid/20250213111628.2183753-1-jouni.hogander@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 427a7d1df1f99..4e938bad808cc 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -2187,7 +2187,8 @@ void intel_psr_disable(struct intel_dp *intel_dp, if (!old_crtc_state->has_psr) return; - if (drm_WARN_ON(display->drm, !CAN_PSR(intel_dp))) + if (drm_WARN_ON(display->drm, !CAN_PSR(intel_dp) && + !CAN_PANEL_REPLAY(intel_dp))) return; mutex_lock(&intel_dp->psr.lock);