drm/i915/psr: Simplify the conditions for SCL computation

'needs_sel_update' is common for both display version branches, so check it
once and keep the version specific checks as separate early returns.

v2: Split into separate early returns. (Jani)

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/20260517142753.2813959-2-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 19cfb23fe9f817f444b70243671a80a6e3dbce64..6d3801cb0612299ca86e3c852b6b3ba4503c299c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1508,15 +1508,18 @@ int _intel_psr_min_set_context_latency(const struct intel_crtc_state *crtc_state
         * SRD_STATUS is used by PSR1 and Panel Replay DP on LunarLake.
         */
 
-       if (DISPLAY_VER(display) >= 30 && (needs_panel_replay ||
-                                          needs_sel_update))
+       if (needs_sel_update)
                return 0;
-       else if (DISPLAY_VER(display) < 30 && (needs_sel_update ||
-                                              intel_crtc_has_type(crtc_state,
-                                                                  INTEL_OUTPUT_EDP)))
+
+       if (DISPLAY_VER(display) < 30 &&
+           intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP))
                return 0;
-       else
-               return 1;
+
+       if (DISPLAY_VER(display) >= 30 &&
+           needs_panel_replay)
+               return 0;
+
+       return 1;
 }
 
 static bool _wake_lines_fit_into_vblank(const struct intel_crtc_state *crtc_state,