drm/i915/display: Skip Panel Replay on pipe comparison if no active planes

Panel Replay is not enabled if there are no active planes. Do not compare
it on pipe comparison. Otherwise we get pipe mismatch.

Fixes: ac9ef327327b ("drm/i915/psr: Panel replay has to be enabled before link training")
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240607134917.1327574-5-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5a91f67a8c9fc2fb28b7277f45ea69c20f9918ac..5e0aa5a0b10caf72df6fca2554e4d76c455b2696 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5372,7 +5372,9 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
         * Panel replay has to be enabled before link training. PSR doesn't have
         * this requirement -> check these only if using panel replay
         */
-       if (current_config->has_panel_replay || pipe_config->has_panel_replay) {
+       if (current_config->active_planes &&
+           (current_config->has_panel_replay ||
+            pipe_config->has_panel_replay)) {
                PIPE_CONF_CHECK_BOOL(has_psr);
                PIPE_CONF_CHECK_BOOL(has_sel_update);
                PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch);