[PATCH 15/22] drm/i915: Introduce intel_crtc_joined_pipe_mask()

[Murthy, Arun R]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of Ville
> Syrjala
> Sent: Friday, March 29, 2024 6:43 AM
> To: intel-gfx at lists.freedesktop.org
> Subject: [PATCH 15/22] drm/i915: Introduce intel_crtc_joined_pipe_mask()
> 
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Add a small helper to compute the set of pipes that the current crtc is using.
> 
> And we have at least one trivial place in
> intel_ddi_update_active_dpll() where we can use it immediately, so let's do
> that.
> 
> v2: Use the name 'pipe_crtc' for the per-pipe crtc pointer
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Arun R Murthy <arun.r.murthy at intel.com>

Thanks and Regards,
Arun R Murthy
-------------------

> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c     | 11 +++++------
>  drivers/gpu/drm/i915/display/intel_display.c |  7 +++++++
> drivers/gpu/drm/i915/display/intel_display.h |  1 +
>  3 files changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index fa6fe9ec8027..24a9be2a217f 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3463,18 +3463,17 @@ void intel_ddi_update_active_dpll(struct
> intel_atomic_state *state,
>  				  struct intel_crtc *crtc)
>  {
>  	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> -	struct intel_crtc_state *crtc_state =
> +	const struct intel_crtc_state *crtc_state =
>  		intel_atomic_get_new_crtc_state(state, crtc);
> -	struct intel_crtc *slave_crtc;
> +	struct intel_crtc *pipe_crtc;
> 
>  	/* FIXME: Add MTL pll_mgr */
>  	if (DISPLAY_VER(i915) >= 14 || !intel_encoder_is_tc(encoder))
>  		return;
> 
> -	intel_update_active_dpll(state, crtc, encoder);
> -	for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc,
> -
> intel_crtc_bigjoiner_slave_pipes(crtc_state))
> -		intel_update_active_dpll(state, slave_crtc, encoder);
> +	for_each_intel_crtc_in_pipe_mask(&i915->drm, pipe_crtc,
> +
> intel_crtc_joined_pipe_mask(crtc_state))
> +		intel_update_active_dpll(state, pipe_crtc, encoder);
>  }
> 
>  static void
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 6197b62dac55..58ee40786d5c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -275,6 +275,13 @@ static int intel_bigjoiner_num_pipes(const struct
> intel_crtc_state *crtc_state)
>  	return hweight8(crtc_state->bigjoiner_pipes);
>  }
> 
> +u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state
> +*crtc_state) {
> +	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> +
> +	return BIT(crtc->pipe) | crtc_state->bigjoiner_pipes; }
> +
>  struct intel_crtc *intel_master_crtc(const struct intel_crtc_state *crtc_state)  {
>  	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h
> b/drivers/gpu/drm/i915/display/intel_display.h
> index 986ec77490de..31ee34c59844 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -408,6 +408,7 @@ intel_cpu_transcoder_mode_valid(struct
> drm_i915_private *i915,  enum phy intel_port_to_phy(struct drm_i915_private
> *i915, enum port port);  bool is_trans_port_sync_mode(const struct
> intel_crtc_state *state);  bool is_trans_port_sync_master(const struct
> intel_crtc_state *state);
> +u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state
> +*crtc_state);
>  bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state);
> bool intel_crtc_is_bigjoiner_master(const struct intel_crtc_state *crtc_state);
>  u8 intel_crtc_bigjoiner_slave_pipes(const struct intel_crtc_state *crtc_state);
> --
> 2.43.2