From: Jouni Högander Date: Mon, 19 Aug 2024 09:25:49 +0000 (+0300) Subject: drm/i915/psr: Prevent Panel Replay if CRC calculation is enabled X-Git-Tag: v6.12-rc1~126^2~14^2~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8efd8ce280996fe29f2564f705e96e18da3fa62;p=thirdparty%2Fkernel%2Flinux.git drm/i915/psr: Prevent Panel Replay if CRC calculation is enabled Similarly as for PSR2 CRC calculation seems to timeout when Panel Replay is enabled. Fix this by falling back to PSR if CRC calculation is enabled. Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2266 Signed-off-by: Jouni Högander Reviewed-by: Mika Kahola Link: https://patchwork.freedesktop.org/patch/msgid/20240819092549.1298233-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 9cb1cdaaeefa7..572dcdf77453c 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1586,6 +1586,12 @@ _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(&i915->drm, + "Panel Replay not enabled because it would inhibit pipe CRC calculation\n"); + return false; + } + return true; }