drm/i915/psr: Prevent DP Panel Replay as well when CRC is enable
authorJouni Högander <jouni.hogander@intel.com>
Mon, 31 Mar 2025 09:07:47 +0000 (12:07 +0300)
committerJouni Högander <jouni.hogander@intel.com>
Wed, 2 Apr 2025 05:35:06 +0000 (08:35 +0300)
We are seeing timeouts in opening CRC fd when testing on setup where DP
Panel Replay can be enabled. Fix these by checking if CRC is enabled for DP
Panel Replay as well.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250331090747.2964028-1-jouni.hogander@intel.com
drivers/gpu/drm/i915/display/intel_psr.c

index 55414fa55b126ac517fd75d89c841fa513a0b6c5..eef48c014112afc74cd3c369810cee51125aa48e 100644 (file)
@@ -1595,6 +1595,12 @@ _panel_replay_compute_config(struct intel_dp *intel_dp,
                return false;
        }
 
+       if (crtc_state->crc_enabled) {
+               drm_dbg_kms(display->drm,
+                           "Panel Replay not enabled because it would inhibit pipe CRC calculation\n");
+               return false;
+       }
+
        if (!intel_dp_is_edp(intel_dp))
                return true;
 
@@ -1625,12 +1631,6 @@ _panel_replay_compute_config(struct intel_dp *intel_dp,
        if (!alpm_config_valid(intel_dp, crtc_state, true))
                return false;
 
-       if (crtc_state->crc_enabled) {
-               drm_dbg_kms(display->drm,
-                           "Panel Replay not enabled because it would inhibit pipe CRC calculation\n");
-               return false;
-       }
-
        return true;
 }