drm/i915/display: Do not check psr2 if psr/panel replay is not supported
authorJouni Högander <jouni.hogander@intel.com>
Mon, 20 Nov 2023 13:02:14 +0000 (15:02 +0200)
committerJouni Högander <jouni.hogander@intel.com>
Thu, 23 Nov 2023 07:47:02 +0000 (09:47 +0200)
Do not continue to psr2 checks if psr or panel replay is not supported.

Cc: Animesh Manna <animesh.manna@intel.com>
Fixes: b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay")
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9670
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/20231120130214.3332726-1-jouni.hogander@intel.com
drivers/gpu/drm/i915/display/intel_psr.c

index 204da50e3f2862d88992e78a686fe22a8af636a0..15c1804dcd59ec9bd26324eaeaf4c7f9e03962f3 100644 (file)
@@ -1373,6 +1373,9 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
        else
                crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state);
 
+       if (!(crtc_state->has_panel_replay || crtc_state->has_psr))
+               return;
+
        crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state);
 
        crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);