Re: [PATCH] drm/i915: move intel_gmch.[ch] from soc/ to display/

["Ville Syrjälä" <ville.syrjala@linux.intel.com>]

On Thu, Nov 13, 2025 at 03:37:50PM +0200, Jani Nikula wrote:
> The sole user of the remaining functions in intel_gmch.[ch] is in
> display. Move them under display.
> 
> This allows us to remove the compat soc/intel_gmch.h from xe.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/Makefile                           | 5 +----
>  drivers/gpu/drm/i915/{soc => display}/intel_gmch.c      | 3 +--
>  drivers/gpu/drm/i915/{soc => display}/intel_gmch.h      | 0
>  drivers/gpu/drm/i915/display/intel_vga.c                | 3 +--
>  drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h | 6 ------
>  5 files changed, 3 insertions(+), 14 deletions(-)
>  rename drivers/gpu/drm/i915/{soc => display}/intel_gmch.c (95%)
>  rename drivers/gpu/drm/i915/{soc => display}/intel_gmch.h (100%)
>  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h
> 
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 90588d5bb908..98822c98d960 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -57,10 +57,6 @@ i915-y += \
>  	vlv_iosf_sb.o \
>  	vlv_suspend.o
>  
> -# core peripheral code
> -i915-y += \
> -	soc/intel_gmch.o
> -
>  # core library code
>  i915-y += \
>  	i915_memcpy.o \
> @@ -280,6 +276,7 @@ i915-y += \
>  	display/intel_flipq.o \
>  	display/intel_frontbuffer.o \
>  	display/intel_global_state.o \
> +	display/intel_gmch.o \

I think I'd just stick the stuff into intel_vga.c since 
that's where the vgaarb registration is as well.

>  	display/intel_hdcp.o \
>  	display/intel_hdcp_gsc.o \
>  	display/intel_hdcp_gsc_message.o \
> diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/display/intel_gmch.c
> similarity index 95%
> rename from drivers/gpu/drm/i915/soc/intel_gmch.c
> rename to drivers/gpu/drm/i915/display/intel_gmch.c
> index 30f489417064..7797c7341047 100644
> --- a/drivers/gpu/drm/i915/soc/intel_gmch.c
> +++ b/drivers/gpu/drm/i915/display/intel_gmch.c
> @@ -9,9 +9,8 @@
>  #include <drm/drm_print.h>
>  #include <drm/intel/i915_drm.h>
>  
> -#include "../display/intel_display_core.h" /* FIXME */
> -
>  #include "i915_drv.h"
> +#include "intel_display_core.h"
>  #include "intel_gmch.h"
>  #include "intel_pci_config.h"
>  
> diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.h b/drivers/gpu/drm/i915/display/intel_gmch.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/soc/intel_gmch.h
> rename to drivers/gpu/drm/i915/display/intel_gmch.h
> diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
> index 6e125564db34..91ba17965ee3 100644
> --- a/drivers/gpu/drm/i915/display/intel_vga.c
> +++ b/drivers/gpu/drm/i915/display/intel_vga.c
> @@ -11,10 +11,9 @@
>  #include <drm/drm_print.h>
>  #include <video/vga.h>
>  
> -#include "soc/intel_gmch.h"
> -
>  #include "intel_de.h"
>  #include "intel_display.h"
> +#include "intel_gmch.h"
>  #include "intel_vga.h"
>  #include "intel_vga_regs.h"
>  
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h b/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h
> deleted file mode 100644
> index 33c5257b3a71..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2023 Intel Corporation
> - */
> -
> -#include "../../../i915/soc/intel_gmch.h"
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel