Re: [PATCH 03/15] drm/i915/pfit: Stop using HAS_PCH_SPLIT() in confusing places

[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>
>
> Stop using HAS_PCH_SPLIT() in places that have nothing to
> do with PCH. !HAS_GMCH is a more sensible thing top check for.

*to

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


>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/i9xx_wm.c               | 2 +-
>  drivers/gpu/drm/i915/display/intel_display.c         | 2 +-
>  drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c
> index 86d1c9f7f0ff..0233f5053d95 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_wm.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c
> @@ -4150,7 +4150,7 @@ static const struct intel_wm_funcs nop_funcs = {
>  void i9xx_wm_init(struct intel_display *display)
>  {
>  	/* For FIFO watermark updates */
> -	if (HAS_PCH_SPLIT(display)) {
> +	if (!HAS_GMCH(display)) {
>  		ilk_setup_wm_latency(display);
>  		display->wm.funcs = &ilk_wm_funcs;
>  	} else if (display->platform.valleyview || display->platform.cherryview) {
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 723dec35402a..d1440cc6dba4 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -6777,7 +6777,7 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
>  	if (DISPLAY_VER(display) >= 9) {
>  		if (new_crtc_state->pfit.enabled)
>  			skl_pfit_enable(new_crtc_state);
> -	} else if (HAS_PCH_SPLIT(display)) {
> +	} else if (!HAS_GMCH(display)) {
>  		if (new_crtc_state->pfit.enabled)
>  			ilk_pfit_enable(new_crtc_state);
>  		else if (old_crtc_state->pfit.enabled)
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 3e302f23f247..dba34f034785 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -96,7 +96,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
>  
>  	if (DISPLAY_VER(display) >= 9)
>  		/* no global SR status; inspect per-plane WM */;
> -	else if (HAS_PCH_SPLIT(display))
> +	else if (!HAS_GMCH(display))
>  		sr_enabled = intel_de_read(display, WM1_LP_ILK) & WM_LP_ENABLE;
>  	else if (display->platform.i965gm || display->platform.g4x ||
>  		 display->platform.i945g || display->platform.i945gm)

-- 
Jani Nikula, Intel