]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/psr: Fix drm_WARN_ON in intel_psr_disable
authorJouni Högander <jouni.hogander@intel.com>
Thu, 13 Feb 2025 11:16:28 +0000 (13:16 +0200)
committerJouni Högander <jouni.hogander@intel.com>
Wed, 19 Feb 2025 12:04:08 +0000 (14:04 +0200)
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 <jouni.hogander@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213111628.2183753-1-jouni.hogander@intel.com
drivers/gpu/drm/i915/display/intel_psr.c

index 427a7d1df1f99c19d9cd93937ba3a4a3195c8803..4e938bad808cc602b3818b991ddfd8dd4c9f64cc 100644 (file)
@@ -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);