On Tue, 2026-08-25 at 11:15 +0530, Animesh Manna wrote:
> For DP2.1, ALPM is optional and there can be scenario where panel
> replay
> will be supported without ALPM. So decouple ALPM feature by has_alpm
> flag
> from related display features.
>
> Cc: Jouni Högander <[email protected]>
> Signed-off-by: Animesh Manna <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_alpm.c | 19 +++------
> drivers/gpu/drm/i915/display/intel_alpm.h | 2 -
> drivers/gpu/drm/i915/display/intel_cx0_phy.c | 6 ++-
> .../drm/i915/display/intel_display_types.h | 1 +
> drivers/gpu/drm/i915/display/intel_lt_phy.c | 2 +-
> drivers/gpu/drm/i915/display/intel_psr.c | 39 +++++++++--------
> --
> drivers/gpu/drm/i915/display/intel_psr.h | 1 -
> 7 files changed, 30 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c
> b/drivers/gpu/drm/i915/display/intel_alpm.c
> index f3f6f40f9624..8c17da9883d6 100644
> --- a/drivers/gpu/drm/i915/display/intel_alpm.c
> +++ b/drivers/gpu/drm/i915/display/intel_alpm.c
> @@ -37,13 +37,6 @@ bool intel_alpm_aux_less_wake_supported(struct
> intel_dp *intel_dp)
> return intel_dp->alpm_dpcd & DP_ALPM_AUX_LESS_CAP;
> }
>
> -bool intel_alpm_is_alpm_aux_less(struct intel_dp *intel_dp,
> - const struct intel_crtc_state
> *crtc_state)
> -{
> - return intel_psr_needs_alpm_aux_less(intel_dp, crtc_state)
> ||
> - (crtc_state->has_lobf &&
> intel_alpm_aux_less_wake_supported(intel_dp));
> -}
> -
> bool intel_alpm_source_supported(struct intel_connector *connector)
> {
> struct intel_display *display = to_intel_display(connector);
> @@ -513,6 +506,7 @@ void intel_alpm_lobf_compute_config_late(struct
> intel_dp *intel_dp,
>
> crtc_state->has_lobf = (crtc_state->set_context_latency +
> crtc_state->vrr.guardband) >
> (first_sdp_position +
> waketime_in_lines);
> + crtc_state->has_alpm = crtc_state->has_lobf;
> }
>
> void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp,
> @@ -575,8 +569,7 @@ static void lnl_alpm_configure(struct intel_dp
> *intel_dp,
> enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
> u32 alpm_ctl, alpm_ctl2, lttpr_count;
>
> - if (DISPLAY_VER(display) < 20 ||
> (!intel_psr_needs_alpm(intel_dp, crtc_state) &&
> - !crtc_state->has_lobf))
> + if (DISPLAY_VER(display) < 20 || !crtc_state->has_alpm)
> return;
>
> mutex_lock(&intel_dp->alpm.lock);
> @@ -584,7 +577,7 @@ static void lnl_alpm_configure(struct intel_dp
> *intel_dp,
> * Panel Replay on eDP is always using ALPM aux less. I.e.
> no need to
> * check panel support at this point.
> */
> - if (intel_alpm_is_alpm_aux_less(intel_dp, crtc_state)) {
> + if (intel_alpm_aux_less_wake_supported(intel_dp)) {
In Bspec:
"PSR2 must use the AUX-Wake ALPM flows. See the "Transcoder Advanced
Link Power Management (ALPM)" section for more details."
> alpm_ctl = ALPM_CTL_ALPM_ENABLE |
> ALPM_CTL_ALPM_AUX_LESS_ENABLE |
> ALPM_CTL_AUX_LESS_SLEEP_HOLD_TIME_50_SYMBOLS
> ;
> @@ -648,10 +641,10 @@ void intel_alpm_port_configure(struct intel_dp
> *intel_dp,
> enum port port = dp_to_dig_port(intel_dp)->base.port;
> u32 alpm_ctl_val = 0, lfps_ctl_val = 0;
>
> - if (DISPLAY_VER(display) < 20)
> + if (DISPLAY_VER(display) < 20 || !crtc_state->has_alpm)
> return;
>
> - if (intel_alpm_is_alpm_aux_less(intel_dp, crtc_state)) {
> + if (intel_alpm_aux_less_wake_supported(intel_dp)) {
> int lfps_cycle = get_lfps_cycle_count(crtc_state);
> u32 lfps_cycle_val;
>
> @@ -710,7 +703,7 @@ void intel_alpm_enable_sink(struct intel_dp
> *intel_dp,
> {
> u8 val;
>
> - if (!intel_psr_needs_alpm(intel_dp, crtc_state) &&
> !crtc_state->has_lobf)
> + if (!crtc_state->has_alpm)
> return;
>
> val = DP_ALPM_ENABLE | DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE;
> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.h
> b/drivers/gpu/drm/i915/display/intel_alpm.h
> index b0f6e2a9eede..bca746d88da3 100644
> --- a/drivers/gpu/drm/i915/display/intel_alpm.h
> +++ b/drivers/gpu/drm/i915/display/intel_alpm.h
> @@ -35,8 +35,6 @@ void intel_alpm_lobf_enable(const struct
> intel_crtc_state *new_crtc_state);
> void intel_alpm_lobf_debugfs_add(struct intel_connector *connector);
> bool intel_alpm_aux_wake_supported(struct intel_dp *intel_dp);
> bool intel_alpm_aux_less_wake_supported(struct intel_dp *intel_dp);
> -bool intel_alpm_is_alpm_aux_less(struct intel_dp *intel_dp,
> - const struct intel_crtc_state
> *crtc_state);
> void intel_alpm_disable(struct intel_dp *intel_dp);
> bool intel_alpm_get_error(struct intel_dp *intel_dp);
> void intel_alpm_lobf_compute_config_late(struct intel_dp *intel_dp,
> diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> index dbebd7210848..4ad09a894eb2 100644
> --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> @@ -3449,8 +3449,10 @@ void intel_lnl_mac_transmit_lfps(struct
> intel_encoder *encoder,
> int i;
> u8 owned_lane_mask;
>
> - if (DISPLAY_VER(display) < 20 ||
> - !intel_alpm_is_alpm_aux_less(enc_to_intel_dp(encoder),
> crtc_state))
> + if (DISPLAY_VER(display) < 20 || !crtc_state->has_alpm)
> + return;
> +
> + if
> (!intel_alpm_aux_less_wake_supported(enc_to_intel_dp(encoder)))
> return;
>
> owned_lane_mask = intel_cx0_get_owned_lane_mask(encoder);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 20a07ea06b5e..f8ac98ff8a87 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1442,6 +1442,7 @@ struct intel_crtc_state {
> u8 silence_period_sym_clocks;
> u8 lfps_half_cycle_num_of_syms;
> } alpm_state;
> + bool has_alpm;
>
> /* to track changes in plane color blocks */
> bool plane_color_changed;
> diff --git a/drivers/gpu/drm/i915/display/intel_lt_phy.c
> b/drivers/gpu/drm/i915/display/intel_lt_phy.c
> index 4fe010df20be..62607284c350 100644
> --- a/drivers/gpu/drm/i915/display/intel_lt_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_lt_phy.c
> @@ -2371,7 +2371,7 @@ void intel_xe3plpd_mac_transmit_lfps(struct
> intel_encoder *encoder,
> struct ref_tracker *wakeref;
> u8 owned_lane_mask;
>
> - if (!intel_alpm_is_alpm_aux_less(intel_dp, crtc_state))
> + if (!crtc_state->has_alpm ||
> !intel_alpm_aux_less_wake_supported(intel_dp))
> return;
>
> wakeref = intel_lt_phy_transaction_begin(encoder);
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 52836496040f..6a03bc624108 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1648,6 +1648,8 @@ static bool
> intel_sel_update_config_valid(struct intel_crtc_state *crtc_state,
> crtc_state->enable_psr2_su_region_et =
> psr2_su_region_et_valid(connector,
>
> crtc_state->has_panel_replay);
>
> + crtc_state->has_alpm = intel_alpm_is_possible(intel_dp);
I don't really understand why this is here? PSR2 and Panel Replay needs
both ALPM. PSR1 doesn't. PSR2 specific compute config is
intel_psr2_config_valid and Panel Replay compute config is
_panel_replay_compute_config.
> +
> return true;
>
> unsupported:
> @@ -1735,11 +1737,17 @@ static bool
> _panel_replay_compute_config(struct intel_crtc_state *crtc_state,
> crtc_state->link_off_after_as_sdp_when_pr_active =
> compute_link_off_after_as_sdp_when_pr_active(connector);
> crtc_state->disable_as_sdp_when_pr_active =
> compute_disable_as_sdp_when_pr_active(connector);
>
> + if (intel_alpm_is_possible(intel_dp))
> + crtc_state->has_alpm = alpm_config_valid(intel_dp,
> crtc_state, true, true, false);
> +
Maybe you should have this in intel_psr2_config_valid as well?
BR,
Jouni Högander
> if (!intel_dp_is_edp(intel_dp))
> return true;
>
> /* Remaining checks are for eDP only */
>
> + if (!crtc_state->has_alpm)
> + return false;
> +
> if (to_intel_crtc(crtc_state->uapi.crtc)->pipe != PIPE_A &&
> to_intel_crtc(crtc_state->uapi.crtc)->pipe != PIPE_B)
> return false;
> @@ -1762,9 +1770,6 @@ static bool _panel_replay_compute_config(struct
> intel_crtc_state *crtc_state,
> return false;
> }
>
> - if (!alpm_config_valid(intel_dp, crtc_state, true, true,
> false))
> - return false;
> -
> return true;
> }
>
> @@ -4530,16 +4535,6 @@ void intel_psr_connector_debugfs_add(struct
> intel_connector *connector)
> connector,
> &i915_psr_status_fops);
> }
>
> -bool intel_psr_needs_alpm(struct intel_dp *intel_dp, const struct
> intel_crtc_state *crtc_state)
> -{
> - /*
> - * eDP Panel Replay uses always ALPM
> - * PSR2 uses ALPM but PSR1 doesn't
> - */
> - return intel_dp_is_edp(intel_dp) && (crtc_state-
> >has_sel_update ||
> - crtc_state-
> >has_panel_replay);
> -}
> -
> bool intel_psr_needs_alpm_aux_less(struct intel_dp *intel_dp,
> const struct intel_crtc_state
> *crtc_state)
> {
> @@ -4553,15 +4548,17 @@ void intel_psr_compute_config_late(struct
> intel_dp *intel_dp,
> int vblank = intel_crtc_vblank_length(crtc_state);
> int wake_lines;
>
> - if (intel_psr_needs_alpm_aux_less(intel_dp, crtc_state))
> - wake_lines = crtc_state-
> >alpm_state.aux_less_wake_lines;
> - else if (intel_psr_needs_alpm(intel_dp, crtc_state))
> - wake_lines = DISPLAY_VER(display) < 20 ?
> - psr2_block_count_lines(crtc_state-
> >alpm_state.io_wake_lines,
> - crtc_state-
> >alpm_state.fast_wake_lines) :
> - crtc_state->alpm_state.io_wake_lines;
> - else
> + if (crtc_state->has_alpm) {
> + if (intel_alpm_aux_less_wake_supported(intel_dp))
> + wake_lines = crtc_state-
> >alpm_state.aux_less_wake_lines;
> + else
> + wake_lines = DISPLAY_VER(display) < 20 ?
> +
> psr2_block_count_lines(crtc_state->alpm_state.io_wake_lines,
> +
> crtc_state->alpm_state.fast_wake_lines) :
> + crtc_state-
> >alpm_state.io_wake_lines;
> + } else {
> wake_lines = 0;
> + }
>
> /*
> * Disable the PSR features if wake lines exceed the
> available vblank.
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.h
> b/drivers/gpu/drm/i915/display/intel_psr.h
> index d545fdaa0de7..4905ba4da4b8 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.h
> +++ b/drivers/gpu/drm/i915/display/intel_psr.h
> @@ -79,7 +79,6 @@ void intel_psr_trigger_frame_change_event(struct
> intel_dsb *dsb,
> int intel_psr_min_set_context_latency(const struct intel_crtc_state
> *crtc_state);
> void intel_psr_connector_debugfs_add(struct intel_connector
> *connector);
> void intel_psr_debugfs_register(struct intel_display *display);
> -bool intel_psr_needs_alpm(struct intel_dp *intel_dp, const struct
> intel_crtc_state *crtc_state);
> bool intel_psr_needs_alpm_aux_less(struct intel_dp *intel_dp,
> const struct intel_crtc_state
> *crtc_state);
> void intel_psr_compute_config_late(struct intel_dp *intel_dp,
