Re: [PATCH 05/15] drm/i915/pfit: Rename some pfit functions

[Jani Nikula <jani.nikula@linux.intel.com>]

On Mon, 19 Oct 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Most pfit functions are called {ilk,i9xx}_pfit_*(). Rename
> {gmch,ilk}_panel_fitting() and intel_gmch_pfit_check_timings()
> to match.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_pfit.c | 21 +++++++++++++--------
>  1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_pfit.c b/drivers/gpu/drm/i915/display/intel_pfit.c
> index b4a201dc8f7b..972218346362 100644
> --- a/drivers/gpu/drm/i915/display/intel_pfit.c
> +++ b/drivers/gpu/drm/i915/display/intel_pfit.c
> @@ -182,8 +182,8 @@ static int ilk_pfit_check_cloning(const struct intel_crtc_state *crtc_state)
>  }
>  
>  /* adjusted_mode has been preset to be the panel's fixed mode */
> -static int ilk_panel_fitting(struct intel_crtc_state *crtc_state,
> -			     const struct drm_connector_state *conn_state)
> +static int ilk_pfit_compute_config(struct intel_crtc_state *crtc_state,
> +				   const struct drm_connector_state *conn_state)
>  {
>  	struct intel_display *display = to_intel_display(crtc_state);
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> @@ -438,7 +438,7 @@ static void i9xx_scale_aspect(struct intel_crtc_state *crtc_state,
>  	}
>  }
>  
> -static int intel_gmch_pfit_check_timings(const struct intel_crtc_state *crtc_state)
> +static int i9xx_pfit_check_timings(const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_display *display = to_intel_display(crtc_state);
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> @@ -470,8 +470,8 @@ static int intel_gmch_pfit_check_timings(const struct intel_crtc_state *crtc_sta
>  	return 0;
>  }
>  
> -static int gmch_panel_fitting(struct intel_crtc_state *crtc_state,
> -			      const struct drm_connector_state *conn_state)
> +static int i9xx_pfit_compute_config(struct intel_crtc_state *crtc_state,
> +				    const struct drm_connector_state *conn_state)
>  {
>  	struct intel_display *display = to_intel_display(crtc_state);
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> @@ -479,6 +479,7 @@ static int gmch_panel_fitting(struct intel_crtc_state *crtc_state,
>  	struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
>  	int pipe_src_w = drm_rect_width(&crtc_state->pipe_src);
>  	int pipe_src_h = drm_rect_height(&crtc_state->pipe_src);
> +	int ret;
>  
>  	/* Native modes don't need fitting */
>  	if (adjusted_mode->crtc_hdisplay == pipe_src_w &&
> @@ -566,7 +567,11 @@ static int gmch_panel_fitting(struct intel_crtc_state *crtc_state,
>  	if ((pfit_control & PFIT_ENABLE) == 0)
>  		return 0;
>  
> -	return intel_gmch_pfit_check_timings(crtc_state);
> +	ret = i9xx_pfit_check_timings(crtc_state);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
>  }
>  
>  enum drm_mode_status
> @@ -585,9 +590,9 @@ int intel_pfit_compute_config(struct intel_crtc_state *crtc_state,
>  	struct intel_display *display = to_intel_display(crtc_state);
>  
>  	if (HAS_GMCH(display))
> -		return gmch_panel_fitting(crtc_state, conn_state);
> +		return i9xx_pfit_compute_config(crtc_state, conn_state);
>  	else
> -		return ilk_panel_fitting(crtc_state, conn_state);
> +		return ilk_pfit_compute_config(crtc_state, conn_state);
>  }
>  
>  void ilk_pfit_enable(const struct intel_crtc_state *crtc_state)

-- 
Jani Nikula, Intel