> -----Original Message-----
> From: Hogander, Jouni <jouni.hogander@xxxxxxxxx>
> Sent: Wednesday, June 5, 2024 3:56 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Manna, Animesh <animesh.manna@xxxxxxxxx>; Kahola, Mika
> <mika.kahola@xxxxxxxxx>; Hogander, Jouni <jouni.hogander@xxxxxxxxx>
> Subject: [PATCH v6 04/26] 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@xxxxxxxxx>
Reviewed-by: Animesh Manna <animesh.manna@xxxxxxxxx>
> ---
> 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 7370acdd6b8b..2747dd01bb0a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5331,7 +5331,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
