Re: [PATCH v3 2/5] drm/i915/scaler: Use crtc_state to setup plane or pipe scaler

["Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com>]

On 1/6/2025 10:21 PM, Mitul Golani wrote:
> Pass crtc_state to intel_atomic_setup_scaler, this will help to
> check if pch_pfit enabled or not and also will be useful to pass
> scaler_state with the same which will be used later to store
> hscale and vscale values.
>
> -- v2:
> - Commit message updates. parse to pass. (Ankit)
>
> Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>
> ---
>   drivers/gpu/drm/i915/display/skl_scaler.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c
> index 6c69545fe172..4f838220f880 100644
> --- a/drivers/gpu/drm/i915/display/skl_scaler.c
> +++ b/drivers/gpu/drm/i915/display/skl_scaler.c
> @@ -309,13 +309,15 @@ static int intel_allocate_scaler(struct intel_crtc_scaler_state *scaler_state,
>   	return -1;
>   }
>   
> -static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,
> +static int intel_atomic_setup_scaler(struct intel_crtc_state *crtc_state,
>   				     int num_scalers_need, struct intel_crtc *crtc,
>   				     const char *name, int idx,
>   				     struct intel_plane_state *plane_state,
>   				     int *scaler_id)
>   {
>   	struct intel_display *display = to_intel_display(crtc);
> +	struct intel_crtc_scaler_state *scaler_state =
> +					&crtc_state->scaler_state;

Better to move after dev_priv is declared.

Otherwise LGTM.

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

>   	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>   	u32 mode;
>   
> @@ -444,7 +446,7 @@ static int setup_crtc_scaler(struct intel_atomic_state *state,
>   	struct intel_crtc_scaler_state *scaler_state =
>   		&crtc_state->scaler_state;
>   
> -	return intel_atomic_setup_scaler(scaler_state,
> +	return intel_atomic_setup_scaler(crtc_state,
>   					 hweight32(scaler_state->scaler_users),
>   					 crtc, "CRTC", crtc->base.base.id,
>   					 NULL, &scaler_state->scaler_id);
> @@ -479,7 +481,7 @@ static int setup_plane_scaler(struct intel_atomic_state *state,
>   	if (IS_ERR(plane_state))
>   		return PTR_ERR(plane_state);
>   
> -	return intel_atomic_setup_scaler(scaler_state,
> +	return intel_atomic_setup_scaler(crtc_state,
>   					 hweight32(scaler_state->scaler_users),
>   					 crtc, "PLANE", plane->base.base.id,
>   					 plane_state, &plane_state->scaler_id);