On Mon, 20 Nov 2023, Jouni Högander <jouni.hogander@xxxxxxxxx> wrote:
> Do not continue to psr2 checks if psr or panel replay is not supported.
>
> Cc: Animesh Manna <animesh.manna@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_psr.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 8d180132a74b..9aa1c269cfef 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -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))
Pure nitpicking, but I always find it easier to think and read this:
if (!has_panel_replay && !has_psr)
BR,
Jani.
> + return;
> +
> crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state);
>
> crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);
--
Jani Nikula, Intel
