All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Hogander, Jouni" <jouni.hogander@intel.com>
To: "intel-xe@lists.freedesktop.org" <intel-xe@lists.freedesktop.org>,
	"dri-devel@lists.freedesktop.org"
	<dri-devel@lists.freedesktop.org>,
	"Manna, Animesh" <animesh.manna@intel.com>,
	"intel-gfx@lists.freedesktop.org"
	<intel-gfx@lists.freedesktop.org>
Cc: "Kandpal, Suraj" <suraj.kandpal@intel.com>,
	"Nikula, Jani" <jani.nikula@intel.com>
Subject: Re: [PATCH v7 18/20] drm/i915/alpm: Compute ALPM config before PSR config
Date: Wed, 18 Nov 2026 13:08:07 +0000	[thread overview]
Message-ID: <ea8e768998699062be3bc45e4ff0b0fd706908f4.camel@intel.com> (raw)
In-Reply-To: <20261026054001.799894-19-animesh.manna@intel.com>

On Mon, 2026-10-26 at 11:09 +0530, Animesh Manna wrote:
> The ALPM params are computed by alpm_config_valid() while computing
> the
> PSR config and again by intel_alpm_lobf_compute_config() for LOBF.
> 
> Add intel_alpm_compute_config() which computes the ALPM params once
> before the PSR config and records whether AUX wake and AUX-less ALPM
> are possible in alpm_state.aux_wake_possible and
> alpm_state.aux_less_possible. Do the LOBF compute from there as well.
> alpm_config_valid() now uses these flags to choose between PSR, PSR2
> and Panel Replay.
> 
> No functional change intended.
> 
> Suggested-by: Jouni Högander <jouni.hogander@intel.com>
> Cc: Jouni Högander <jouni.hogander@intel.com>
> Signed-off-by: Animesh Manna <animesh.manna@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_alpm.c     | 33 +++++++++++++++--
> --
>  drivers/gpu/drm/i915/display/intel_alpm.h     |  6 +---
>  .../drm/i915/display/intel_display_types.h    |  4 +++
>  drivers/gpu/drm/i915/display/intel_dp.c       |  2 +-
>  drivers/gpu/drm/i915/display/intel_psr.c      |  8 +++--
>  5 files changed, 38 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c
> b/drivers/gpu/drm/i915/display/intel_alpm.c
> index 3123296df6b2..65d06e8ebbe0 100644
> --- a/drivers/gpu/drm/i915/display/intel_alpm.c
> +++ b/drivers/gpu/drm/i915/display/intel_alpm.c
> @@ -426,8 +426,8 @@ static int io_buffer_wake_time(const struct
> intel_crtc_state *crtc_state)
>  		return skl_io_buffer_wake_time();
>  }
>  
> -bool intel_alpm_compute_params(struct intel_dp *intel_dp,
> -			       struct intel_crtc_state *crtc_state)
> +static bool intel_alpm_compute_params(struct intel_dp *intel_dp,
> +				      struct intel_crtc_state
> *crtc_state)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
>  	int io_wake_lines, io_wake_time, fast_wake_lines,
> fast_wake_time;
> @@ -549,9 +549,8 @@ void intel_alpm_lobf_compute_config_late(struct
> intel_dp *intel_dp,
>  			       (first_sdp_position +
> waketime_in_lines);
>  }
>  
> -void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp,
> -				    struct intel_crtc_state
> *crtc_state,
> -				    struct drm_connector_state
> *conn_state)
> +static void intel_alpm_lobf_compute_config(struct intel_dp
> *intel_dp,
> +					   struct intel_crtc_state
> *crtc_state)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
>  
> @@ -579,10 +578,32 @@ void intel_alpm_lobf_compute_config(struct
> intel_dp *intel_dp,
>  	      intel_alpm_aux_less_wake_supported(intel_dp)))
>  		return;
>  
> +	crtc_state->has_lobf = true;
> +}
> +
> +/*
> + * Compute the ALPM params and whether AUX wake / AUX-less ALPM is
> possible for
> + * the mode and the sink. PSR and Panel Replay use these to choose
> the feature.
> + */
> +void intel_alpm_compute_config(struct intel_dp *intel_dp,
> +			       struct intel_crtc_state *crtc_state)
> +{
> +	struct intel_display *display = to_intel_display(intel_dp);
> +
> +	if (!intel_dp_is_edp(intel_dp) &&
> !intel_alpm_is_possible(intel_dp, crtc_state))
> +		return;
> +
>  	if (!intel_alpm_compute_params(intel_dp, crtc_state))
>  		return;

You should clear has_lobf, aux_wake_possible and aux_less_possible.
Otherwise they may left true after intel_crtc_duplicate_state.

BR,
Jouni Högander

>  
> -	crtc_state->has_lobf = true;
> +	crtc_state->alpm_state.aux_wake_possible = true;
> +	crtc_state->alpm_state.aux_less_possible =
> +		DISPLAY_VER(display) >= 20 &&
> +		(intel_dp_is_edp(intel_dp) ||
> +		 (intel_alpm_is_possible(intel_dp, crtc_state) &&
> +		  intel_alpm_aux_less_wake_supported(intel_dp)));
> +
> +	intel_alpm_lobf_compute_config(intel_dp, crtc_state);
>  }
>  
>  static u32 get_pr_alpm_as_sdp_transmission_time(const struct
> intel_crtc_state *crtc_state)
> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.h
> b/drivers/gpu/drm/i915/display/intel_alpm.h
> index 24c319bc5eff..be9b4d761c13 100644
> --- a/drivers/gpu/drm/i915/display/intel_alpm.h
> +++ b/drivers/gpu/drm/i915/display/intel_alpm.h
> @@ -10,7 +10,6 @@
>  
>  struct intel_dp;
>  struct intel_crtc_state;
> -struct drm_connector_state;
>  struct intel_connector;
>  struct intel_atomic_state;
>  struct intel_crtc;
> @@ -19,11 +18,8 @@ int intel_alpm_init_dpcd(struct intel_dp
> *intel_dp);
>  void intel_alpm_init(struct intel_dp *intel_dp);
>  bool intel_alpm_is_possible(struct intel_dp *intel_dp,
>  			    const struct intel_crtc_state
> *crtc_state);
> -bool intel_alpm_compute_params(struct intel_dp *intel_dp,
> +void intel_alpm_compute_config(struct intel_dp *intel_dp,
>  			       struct intel_crtc_state *crtc_state);
> -void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp,
> -				    struct intel_crtc_state
> *crtc_state,
> -				    struct drm_connector_state
> *conn_state);
>  void intel_alpm_configure(struct intel_dp *intel_dp,
>  			  const struct intel_crtc_state
> *crtc_state);
>  void intel_alpm_enable_sink(struct intel_dp *intel_dp,
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 82a63a2e7fa3..ce7dc3375f2e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1470,6 +1470,10 @@ struct intel_crtc_state {
>  		u8 silence_period_sym_clocks;
>  		u8 lfps_half_cycle_num_of_syms;
>  		int switch_to_active;
> +
> +		/* ALPM params are valid for the mode and the sink
> */
> +		bool aux_wake_possible;
> +		bool aux_less_possible;
>  	} alpm_state;
>  
>  	/* to track changes in plane color blocks */
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index c543fe551eb8..7827de39e826 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -3822,9 +3822,9 @@ intel_dp_compute_config(struct
> intel_atomic_state *state,
>  		pipe_config->dp_m_n.data_m *= pipe_config-
> >splitter.link_count;
>  
>  	intel_vrr_compute_config(pipe_config, conn_state);
> +	intel_alpm_compute_config(intel_dp, pipe_config);
>  	intel_psr_compute_config(intel_dp, pipe_config, conn_state);
>  	intel_dp_compute_as_sdp(intel_dp, pipe_config);
> -	intel_alpm_lobf_compute_config(intel_dp, pipe_config,
> conn_state);
>  	intel_dp_drrs_compute_config(connector, pipe_config,
> link_bpp_x16);
>  	intel_dp_compute_vsc_sdp(intel_dp, pipe_config, conn_state);
>  	intel_dp_compute_hdr_metadata_infoframe_sdp(intel_dp,
> pipe_config, conn_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 4ae47d33096a..c00ec3f64202 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1462,16 +1462,18 @@ static bool wake_lines_fit_into_vblank(struct
> intel_dp *intel_dp,
>  }
>  
>  static bool alpm_config_valid(struct intel_dp *intel_dp,
> -			      struct intel_crtc_state *crtc_state,
> +			      const struct intel_crtc_state
> *crtc_state,
>  			      bool aux_less,
>  			      bool needs_panel_replay,
>  			      bool needs_sel_update)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
> +	bool alpm_possible = aux_less ? crtc_state-
> >alpm_state.aux_less_possible :
> +					crtc_state-
> >alpm_state.aux_wake_possible;
>  
> -	if (!intel_alpm_compute_params(intel_dp, crtc_state)) {
> +	if (!alpm_possible) {
>  		drm_dbg_kms(display->drm,
> -			    "PSR2/Panel Replay  not enabled, Unable
> to use long enough wake times\n");
> +			    "PSR2/Panel Replay not enabled, ALPM not
> possible\n");
>  		return false;
>  	}
>  

  reply	other threads:[~2026-11-18 13:08 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-26  5:39 [PATCH v7 00/20] Enable DP2.1 alpm Animesh Manna
2026-10-26  5:39 ` [PATCH v7 01/20] drm/i915/alpm: Program zero-based LFPS half cycle duration Animesh Manna
2026-10-27 15:33   ` Jani Nikula
2026-10-28  5:42     ` Manna, Animesh
2026-10-26  5:39 ` [PATCH v7 02/20] drm/dp: Add DPCD definitions for DP2.1 ALPM capability Animesh Manna
2026-11-18 11:44   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 03/20] drm/i915/alpm: Move alpm sink capability readout into a separate function Animesh Manna
2026-10-26  5:39 ` [PATCH v7 04/20] drm/i915/alpm: alpm_init() for DP2.1 Animesh Manna
2026-10-26  7:11   ` sashiko-bot
2026-11-18 11:44   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 05/20] drm/i915/alpm: Enable debugfs " Animesh Manna
2026-11-18 11:45   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 06/20] drm/i915/alpm: Refactor Auxless wake time calculation Animesh Manna
2026-11-18 11:46   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 07/20] drm/i915/alpm: Auxless wake time calculation for Xe3p Animesh Manna
2026-10-26  5:39 ` [PATCH v7 08/20] drm/i915/alpm: Modify AUX_LESS_WAKE_TIME bitfield for xe3lpd Animesh Manna
2026-11-02  6:06   ` Kandpal, Suraj
2026-11-18 12:05   ` Hogander, Jouni
2026-11-18 12:12   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 09/20] drm/i915/alpm: table based establishment period Animesh Manna
2026-11-18 12:15   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 10/20] drm/i915/alpm: Half LFPS cycle calculation Animesh Manna
2026-10-26  7:06   ` sashiko-bot
2026-11-18 12:31   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 11/20] drm/i915/alpm: Modify LFPS cycle count for DP ALPM Animesh Manna
2026-10-26  5:39 ` [PATCH v7 12/20] drm/i915/alpm: Modify LFPS_CYCLE_COUNT bitfield for xe3lpd Animesh Manna
2026-11-02  6:07   ` Kandpal, Suraj
2026-10-26  5:39 ` [PATCH v7 13/20] drm/i915/alpm: Program LTTPR count for DP 2.1 ALPM Animesh Manna
2026-11-18 12:35   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 14/20] drm/i915/alpm: Enable MAC Transmitting LFPS for LT PHY Animesh Manna
2026-11-18 12:42   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 15/20] drm/i915/alpm: Compute and program switch to active latency Animesh Manna
2026-11-18 12:46   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 16/20] drm/i915/alpm: Replace is_edp() with alpm_is_possible() Animesh Manna
2026-10-26  7:16   ` sashiko-bot
2026-11-18 12:55   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 17/20] drm/i915/alpm: Disallow ALPM for UHBR link rate Animesh Manna
2026-11-18 12:57   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 18/20] drm/i915/alpm: Compute ALPM config before PSR config Animesh Manna
2026-11-18 13:08   ` Hogander, Jouni [this message]
2026-10-26  5:39 ` [PATCH v7 19/20] drm/i915/alpm: Introduce has_alpm to decouple from pr/psr2/lobf Animesh Manna
2026-10-26  7:23   ` sashiko-bot
2026-11-19  6:35   ` Hogander, Jouni
2026-10-26  5:39 ` [PATCH v7 20/20] drm/i915/dp: Enable AS SDP for DP Panel Replay with AUX-less ALPM Animesh Manna
2026-11-19  7:11   ` Hogander, Jouni
2026-10-26  5:50 ` ✗ CI.checkpatch: warning for Enable DP2.1 alpm (rev7) Patchwork
2026-10-26  5:52 ` ✓ CI.KUnit: success " Patchwork
2026-10-26  6:28 ` ✓ Xe.CI.BAT: " Patchwork
2026-10-26  6:43 ` ✗ i915.CI.BAT: failure " Patchwork
2026-10-26  8:06 ` ✗ Xe.CI.FULL: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ea8e768998699062be3bc45e4ff0b0fd706908f4.camel@intel.com \
    --to=jouni.hogander@intel.com \
    --cc=animesh.manna@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=suraj.kandpal@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.