drm/i915/alpm: use variable from intel_crtc_state instead of intel_psr
authorJouni Högander <jouni.hogander@intel.com>
Wed, 23 Apr 2025 09:23:24 +0000 (14:53 +0530)
committerAnimesh Manna <animesh.manna@intel.com>
Thu, 24 Apr 2025 08:23:34 +0000 (13:53 +0530)
Currently code is making assumption that PSR is enabled when
intel_alpm_configure is called. This doesn't work if alpm is configured
before PSR is enabled.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Link: https://lore.kernel.org/r/20250423092334.2294483-2-animesh.manna@intel.com
drivers/gpu/drm/i915/display/intel_alpm.c

index 55f3ae1e68c90ad86fb657698b72de63c46fbb42..1dbaa8f250aa4cb6b87342785054493129809585 100644 (file)
@@ -317,14 +317,14 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
        u32 alpm_ctl;
 
        if (DISPLAY_VER(display) < 20 ||
-           (!intel_dp->psr.sel_update_enabled && !intel_dp_is_edp(intel_dp)))
+           (!crtc_state->has_sel_update && !intel_dp_is_edp(intel_dp)))
                return;
 
        /*
         * Panel Replay on eDP is always using ALPM aux less. I.e. no need to
         * check panel support at this point.
         */
-       if ((intel_dp->psr.panel_replay_enabled && intel_dp_is_edp(intel_dp)) ||
+       if ((crtc_state->has_panel_replay && intel_dp_is_edp(intel_dp)) ||
            (crtc_state->has_lobf && intel_alpm_aux_less_wake_supported(intel_dp))) {
                alpm_ctl = ALPM_CTL_ALPM_ENABLE |
                        ALPM_CTL_ALPM_AUX_LESS_ENABLE |