[PATCH 2/2] drm/xe/compat: stop including i915_utils.h from compat i915_drv.h

[Rodrigo Vivi]

On Thu, Jul 31, 2025 at 03:36:16PM +0300, Jani Nikula wrote:
> Expose the places that need i915_utils.h, and include it where needed.

again trusting your compiler more than my eyes

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_bios.c               | 1 +
>  drivers/gpu/drm/i915/display/intel_cdclk.c              | 1 +
>  drivers/gpu/drm/i915/display/intel_display_driver.c     | 1 +
>  drivers/gpu/drm/i915/display/intel_display_power.c      | 1 +
>  drivers/gpu/drm/i915/display/intel_display_power_well.c | 1 +
>  drivers/gpu/drm/i915/display/intel_fb.c                 | 1 +
>  drivers/gpu/drm/i915/display/intel_gmbus.c              | 1 +
>  drivers/gpu/drm/i915/display/intel_hotplug.c            | 1 +
>  drivers/gpu/drm/i915/display/intel_vblank.c             | 1 +
>  drivers/gpu/drm/i915/display/skl_universal_plane.c      | 1 +
>  drivers/gpu/drm/i915/soc/intel_dram.c                   | 1 +
>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h       | 1 -
>  drivers/gpu/drm/xe/display/ext/i915_utils.c             | 1 +
>  13 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 9c268bed091d..276ac29e4daf 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -36,6 +36,7 @@
>  #include "soc/intel_rom.h"
>  
>  #include "i915_drv.h"
> +#include "i915_utils.h"
>  #include "intel_display.h"
>  #include "intel_display_core.h"
>  #include "intel_display_rpm.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 228aa64c1349..8ff20415770f 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -31,6 +31,7 @@
>  #include "hsw_ips.h"
>  #include "i915_drv.h"
>  #include "i915_reg.h"
> +#include "i915_utils.h"
>  #include "intel_atomic.h"
>  #include "intel_audio.h"
>  #include "intel_bw.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 8586ba102605..cf1c14412abe 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -18,6 +18,7 @@
>  #include <drm/drm_vblank.h>
>  
>  #include "i915_drv.h"
> +#include "i915_utils.h"
>  #include "i9xx_wm.h"
>  #include "intel_acpi.h"
>  #include "intel_atomic.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 273054c22325..cc80c72ac9d1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -10,6 +10,7 @@
>  #include "i915_drv.h"
>  #include "i915_irq.h"
>  #include "i915_reg.h"
> +#include "i915_utils.h"
>  #include "intel_backlight_regs.h"
>  #include "intel_cdclk.h"
>  #include "intel_clock_gating.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> index 48cac225a809..6efe5524cbbf 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -6,6 +6,7 @@
>  #include "i915_drv.h"
>  #include "i915_irq.h"
>  #include "i915_reg.h"
> +#include "i915_utils.h"
>  #include "intel_backlight_regs.h"
>  #include "intel_combo_phy.h"
>  #include "intel_combo_phy_regs.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 0da842bd2f2f..b210c3250501 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -11,6 +11,7 @@
>  #include <drm/drm_modeset_helper.h>
>  
>  #include "i915_drv.h"
> +#include "i915_utils.h"
>  #include "intel_bo.h"
>  #include "intel_display.h"
>  #include "intel_display_core.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
> index 637f0f23f163..6a74805570e1 100644
> --- a/drivers/gpu/drm/i915/display/intel_gmbus.c
> +++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
> @@ -36,6 +36,7 @@
>  #include "i915_drv.h"
>  #include "i915_irq.h"
>  #include "i915_reg.h"
> +#include "i915_utils.h"
>  #include "intel_de.h"
>  #include "intel_display_regs.h"
>  #include "intel_display_types.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index 265aa97fcc75..740e5c930521 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -28,6 +28,7 @@
>  
>  #include "i915_drv.h"
>  #include "i915_irq.h"
> +#include "i915_utils.h"
>  #include "intel_connector.h"
>  #include "intel_display_power.h"
>  #include "intel_display_core.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
> index 3e51deca0c21..46d6db5fed11 100644
> --- a/drivers/gpu/drm/i915/display/intel_vblank.c
> +++ b/drivers/gpu/drm/i915/display/intel_vblank.c
> @@ -6,6 +6,7 @@
>  #include <drm/drm_vblank.h>
>  
>  #include "i915_drv.h"
> +#include "i915_utils.h"
>  #include "intel_color.h"
>  #include "intel_crtc.h"
>  #include "intel_de.h"
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index ec3fe75f2c6c..950dc79dbdd4 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -10,6 +10,7 @@
>  
>  #include "pxp/intel_pxp.h"
>  #include "i915_drv.h"
> +#include "i915_utils.h"
>  #include "intel_bo.h"
>  #include "intel_de.h"
>  #include "intel_display_irq.h"
> diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
> index deb159548a09..3eeaabdf59e8 100644
> --- a/drivers/gpu/drm/i915/soc/intel_dram.c
> +++ b/drivers/gpu/drm/i915/soc/intel_dram.c
> @@ -11,6 +11,7 @@
>  
>  #include "i915_drv.h"
>  #include "i915_reg.h"
> +#include "i915_utils.h"
>  #include "intel_dram.h"
>  #include "intel_mchbar_regs.h"
>  #include "intel_pcode.h"
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> index d8cd66a96621..b8269391bc69 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -12,7 +12,6 @@
>  
>  #include <drm/drm_drv.h>
>  
> -#include "i915_utils.h"
>  #include "xe_device.h" /* for xe_device_has_flat_ccs() */
>  #include "xe_device_types.h"
>  
> diff --git a/drivers/gpu/drm/xe/display/ext/i915_utils.c b/drivers/gpu/drm/xe/display/ext/i915_utils.c
> index 43b10a2cc508..1421c2a7b64d 100644
> --- a/drivers/gpu/drm/xe/display/ext/i915_utils.c
> +++ b/drivers/gpu/drm/xe/display/ext/i915_utils.c
> @@ -4,6 +4,7 @@
>   */
>  
>  #include "i915_drv.h"
> +#include "i915_utils.h"
>  
>  bool i915_vtd_active(struct drm_i915_private *i915)
>  {
> -- 
> 2.39.5
>