Looks good to me
Reviewed-by: Manasi Navare <navareman...@chromium.org>
Manasi
On Fri, Mar 8, 2024 at 5:11 AM Stanislav Lisovskiy
<stanislav.lisovs...@intel.com> wrote:
>
> 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: - Fixed conflicts, part of patch didn't apply, because of master_crtc
> rename(Stan)
>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovs...@intel.com>
> Credits-to: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 9 ++++-----
> drivers/gpu/drm/i915/display/intel_display.c | 7 +++++++
> drivers/gpu/drm/i915/display/intel_display.h | 1 +
> 3 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index c587a8efeafcf..bbce74f011d40 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3472,17 +3472,16 @@ void intel_ddi_update_active_dpll(struct
> intel_atomic_state *state,
> struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> struct intel_crtc_state *crtc_state =
> intel_atomic_get_new_crtc_state(state, crtc);
> - struct intel_crtc *slave_crtc;
> + struct intel_crtc *pipe_mask_crtc;
> + u8 pipe_mask = intel_crtc_joined_pipe_mask(crtc_state);
> enum phy phy = intel_port_to_phy(i915, encoder->port);
>
> /* FIXME: Add MTL pll_mgr */
> if (DISPLAY_VER(i915) >= 14 || !intel_phy_is_tc(i915, phy))
> 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_mask_crtc,
> pipe_mask)
> + intel_update_active_dpll(state, pipe_mask_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 b88f214e111ae..021db26a630af 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 f4a0773f0fca8..631218c954a47 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -410,6 +410,7 @@ bool is_trans_port_sync_mode(const struct
> intel_crtc_state *state);
> bool is_trans_port_sync_master(const struct intel_crtc_state *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_joined_pipe_mask(const struct intel_crtc_state *crtc_state);
> u8 intel_crtc_bigjoiner_slave_pipes(const struct intel_crtc_state
> *crtc_state);
> struct intel_crtc *intel_master_crtc(const struct intel_crtc_state
> *crtc_state);
> bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state);
> --
> 2.37.3
>
