Re: [PATCH 01/10] drm/intel: move i915_gtt_view_types.h to include/drm/intel

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

On Tue, Sep 15, 2026 at 11:09:12PM +0300, Jani Nikula wrote:
> The i915 and xe drivers share i915_gtt_view_types.h from i915
> source. Move it to include/drm/intel/gtt_view_types.h.
> 
> Remove the i915 compat header.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_types.h         | 2 +-
>  drivers/gpu/drm/i915/i915_vma_types.h                      | 3 +--
>  .../gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h   | 7 -------
>  drivers/gpu/drm/xe/display/xe_fb_pin.c                     | 4 +---
>  .../drm/intel/gtt_view_types.h                             | 6 +++---
>  5 files changed, 6 insertions(+), 16 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h
>  rename drivers/gpu/drm/i915/i915_gtt_view_types.h => include/drm/intel/gtt_view_types.h (93%)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index a5f18ac8a7d0..2a9f690c3d70 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -41,10 +41,10 @@
>  #include <drm/drm_panel.h>
>  #include <drm/drm_rect.h>
>  #include <drm/drm_vblank_work.h>
> +#include <drm/intel/gtt_view_types.h>
>  #include <drm/intel/i915_hdcp_interface.h>
>  #include <uapi/drm/i915_drm.h>
>  
> -#include "i915_gtt_view_types.h"
>  #include "intel_bios.h"
>  #include "intel_display.h"
>  #include "intel_display_conversion.h"
> diff --git a/drivers/gpu/drm/i915/i915_vma_types.h b/drivers/gpu/drm/i915/i915_vma_types.h
> index a499a3bea874..83fe02833b5e 100644
> --- a/drivers/gpu/drm/i915/i915_vma_types.h
> +++ b/drivers/gpu/drm/i915/i915_vma_types.h
> @@ -29,11 +29,10 @@
>  #include <linux/rbtree.h>
>  
>  #include <drm/drm_mm.h>
> +#include <drm/intel/gtt_view_types.h>
>  
>  #include "gem/i915_gem_object_types.h"
>  
> -#include "i915_gtt_view_types.h"
> -
>  /**
>   * DOC: Global GTT views
>   *
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h
> deleted file mode 100644
> index b261910cd6f9..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/* Copyright © 2025 Intel Corporation */
> -
> -#include "../../i915/i915_gtt_view_types.h"
> -
> -/* Partial view not supported in xe, fail build if used. */
> -#define I915_GTT_VIEW_PARTIAL
> diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
> index b46a2c32ac07..6fae8cc27aad 100644
> --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
> +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
> @@ -4,11 +4,9 @@
>   */
>  
>  #include <drm/intel/display_parent_interface.h>
> +#include <drm/intel/gtt_view_types.h>
>  #include <drm/ttm/ttm_bo.h>
>  
> -/* FIXME move the types to parent interface? */
> -#include "i915_gtt_view_types.h"
> -
>  /* FIXME move intel_remapped_info_size() & co. to parent interface? */
>  #include "intel_fb.h"
>  
> diff --git a/drivers/gpu/drm/i915/i915_gtt_view_types.h b/include/drm/intel/gtt_view_types.h
> similarity index 93%
> rename from drivers/gpu/drm/i915/i915_gtt_view_types.h
> rename to include/drm/intel/gtt_view_types.h
> index 9c4f38db32ff..35a48932e5e8 100644
> --- a/drivers/gpu/drm/i915/i915_gtt_view_types.h
> +++ b/include/drm/intel/gtt_view_types.h
> @@ -1,8 +1,8 @@
>  /* SPDX-License-Identifier: MIT */
>  /* Copyright © 2025 Intel Corporation */
>  
> -#ifndef __I915_GTT_VIEW_TYPES_H__
> -#define __I915_GTT_VIEW_TYPES_H__
> +#ifndef __DRM_INTEL_GTT_VIEW_TYPES_H__
> +#define __DRM_INTEL_GTT_VIEW_TYPES_H__
>  
>  #include <linux/types.h>
>  
> @@ -71,4 +71,4 @@ static inline bool i915_gtt_view_is_rotated(const struct i915_gtt_view *view)
>  	return view->type == I915_GTT_VIEW_ROTATED;
>  }
>  
> -#endif /* __I915_GTT_VIEW_TYPES_H__ */
> +#endif

Are we giving up on the "/* __WHATEVER__ */" stuff for the
multiple inclusion guards?

> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel