Re: [PATCH 04/15] drm/i915/pfit: Introduce intel_pfit_get_config()

[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>
>
> Introduce a new intel_pfit_get_config() wrapper to better
> contain the pfit details inside intel_pfit.c.
>
> 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_display.c | 12 ++++--------
>  drivers/gpu/drm/i915/display/intel_pfit.c    | 16 ++++++++++++++--
>  drivers/gpu/drm/i915/display/intel_pfit.h    |  3 +--
>  3 files changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index d1440cc6dba4..79c4aff1c633 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3236,7 +3236,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
>  	intel_get_transcoder_timings(crtc, pipe_config);
>  	intel_get_pipe_src_size(crtc, pipe_config);
>  
> -	i9xx_pfit_get_config(pipe_config);
> +	intel_pfit_get_config(pipe_config);
>  
>  	i9xx_dpll_get_hw_state(crtc, &pipe_config->dpll_hw_state);
>  
> @@ -3586,7 +3586,7 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,
>  	intel_get_transcoder_timings(crtc, pipe_config);
>  	intel_get_pipe_src_size(crtc, pipe_config);
>  
> -	ilk_pfit_get_config(pipe_config);
> +	intel_pfit_get_config(pipe_config);
>  
>  	ret = true;
>  
> @@ -4153,12 +4153,8 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
>  			REG_FIELD_GET(HSW_IPS_LINETIME_MASK, tmp);
>  
>  	if (intel_display_power_get_in_set_if_enabled(display, &crtc->hw_readout_power_domains,
> -						      POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe))) {
> -		if (DISPLAY_VER(display) >= 9)
> -			skl_scaler_get_config(pipe_config);
> -		else
> -			ilk_pfit_get_config(pipe_config);
> -	}
> +						      POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe)))
> +		intel_pfit_get_config(pipe_config);
>  
>  	hsw_ips_get_config(pipe_config);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pfit.c b/drivers/gpu/drm/i915/display/intel_pfit.c
> index aa4a4d10d124..b4a201dc8f7b 100644
> --- a/drivers/gpu/drm/i915/display/intel_pfit.c
> +++ b/drivers/gpu/drm/i915/display/intel_pfit.c
> @@ -638,7 +638,7 @@ void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)
>  	intel_de_write_fw(display, PF_WIN_SZ(pipe), 0);
>  }
>  
> -void ilk_pfit_get_config(struct intel_crtc_state *crtc_state)
> +static void ilk_pfit_get_config(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);
> @@ -724,7 +724,7 @@ static bool i9xx_has_pfit(struct intel_display *display)
>  		display->platform.pineview || display->platform.mobile;
>  }
>  
> -void i9xx_pfit_get_config(struct intel_crtc_state *crtc_state)
> +static void i9xx_pfit_get_config(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);
> @@ -751,3 +751,15 @@ void i9xx_pfit_get_config(struct intel_crtc_state *crtc_state)
>  	crtc_state->gmch_pfit.pgm_ratios =
>  		intel_de_read(display, PFIT_PGM_RATIOS(display));
>  }
> +
> +void intel_pfit_get_config(struct intel_crtc_state *crtc_state)
> +{
> +	struct intel_display *display = to_intel_display(crtc_state);
> +
> +	if (HAS_GMCH(display))
> +		i9xx_pfit_get_config(crtc_state);
> +	else if (DISPLAY_VER(display) >= 9)
> +		skl_scaler_get_config(crtc_state);
> +	else
> +		ilk_pfit_get_config(crtc_state);
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_pfit.h b/drivers/gpu/drm/i915/display/intel_pfit.h
> index c1bb0d1f344e..184e1932eae5 100644
> --- a/drivers/gpu/drm/i915/display/intel_pfit.h
> +++ b/drivers/gpu/drm/i915/display/intel_pfit.h
> @@ -17,10 +17,9 @@ int intel_pfit_compute_config(struct intel_crtc_state *crtc_state,
>  			      const struct drm_connector_state *conn_state);
>  void ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
>  void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state);
> -void ilk_pfit_get_config(struct intel_crtc_state *crtc_state);
>  void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state);
>  void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state);
> -void i9xx_pfit_get_config(struct intel_crtc_state *crtc_state);
> +void intel_pfit_get_config(struct intel_crtc_state *crtc_state);
>  enum drm_mode_status
>  intel_pfit_mode_valid(struct intel_display *display,
>  		      const struct drm_display_mode *mode,

-- 
Jani Nikula, Intel