From: Jouni Högander Date: Mon, 31 Mar 2025 09:07:47 +0000 (+0300) Subject: drm/i915/psr: Prevent DP Panel Replay as well when CRC is enable X-Git-Tag: v6.16-rc1~144^2~20^2~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d354d52c55c6ccebcc4f4148820139f319a4065f;p=thirdparty%2Flinux.git drm/i915/psr: Prevent DP Panel Replay as well when CRC is enable 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 Reviewed-by: Jani Nikula Link: https://lore.kernel.org/r/20250331090747.2964028-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 55414fa55b126..eef48c014112a 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -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; }