[PATCH 7/8] drm/i915/display: Skip Panel Replay on pipe comparison if no active planes

[Jouni Högander]

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.hogan...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 4035b3ec311d..bb8a0922a7f3 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5318,7 +5318,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);
-- 
2.34.1