[Intel-xe] [PATCH v2 6/8] drm/xe: move all top level i915 compat headers to a separate subdirectory

[Jani Nikula]

Be more explicit about which headers override i915 top level
headers. These are not specifically related to display, although they
are mostly only needed for display support.

v2: rename compat-headers to compat-i915-headers (Lucas)

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/xe/Makefile                                 | 6 ++++--
 .../xe/{display => compat-i915-headers}/i915_active_types.h | 0
 .../gpu/drm/xe/{display => compat-i915-headers}/i915_drv.h  | 0
 .../gpu/drm/xe/{display => compat-i915-headers}/i915_vma.h  | 0
 .../xe/{display => compat-i915-headers}/i915_vma_types.h    | 0
 .../xe/{display => compat-i915-headers}/intel_pm_types.h    | 0
 .../xe/{display => compat-i915-headers}/intel_runtime_pm.h  | 0
 .../drm/xe/{display => compat-i915-headers}/intel_wakeref.h | 0
 8 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_active_types.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_drv.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_vma.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_vma_types.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/intel_pm_types.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/intel_runtime_pm.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/intel_wakeref.h (100%)

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 5489d761f6f6..f9e18e5d6ea6 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -96,7 +96,9 @@ xe-y += xe_bb.o \
 	xe_wopcm.o
 
 # i915 Display compat #defines and #includes
-subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += -I$(srctree)/$(src)/display/ext \
+subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
+	-I$(srctree)/$(src)/display/ext \
+	-I$(srctree)/$(src)/compat-i915-headers \
 	-I$(srctree)/drivers/gpu/drm/xe/display/ \
 	-I$(srctree)/drivers/gpu/drm/i915/display/ \
 	-I$(srctree)/drivers/gpu/drm/i915/ \
@@ -214,7 +216,7 @@ obj-$(CONFIG_DRM_XE) += xe.o
 obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/
 
 ifneq ($(CONFIG_DRM_XE_DISPLAY),y)
-	skipdisplay:=-not -path display/\* -not -path xe_display.h
+	skipdisplay:=-not -path display/\* -not -path compat-i915-headers/\* -not -path xe_display.h
 endif
 
 # header test
diff --git a/drivers/gpu/drm/xe/display/i915_active_types.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_active_types.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/i915_active_types.h
rename to drivers/gpu/drm/xe/compat-i915-headers/i915_active_types.h
diff --git a/drivers/gpu/drm/xe/display/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/i915_drv.h
rename to drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
diff --git a/drivers/gpu/drm/xe/display/i915_vma.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/i915_vma.h
rename to drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
diff --git a/drivers/gpu/drm/xe/display/i915_vma_types.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/i915_vma_types.h
rename to drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h
diff --git a/drivers/gpu/drm/xe/display/intel_pm_types.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_pm_types.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/intel_pm_types.h
rename to drivers/gpu/drm/xe/compat-i915-headers/intel_pm_types.h
diff --git a/drivers/gpu/drm/xe/display/intel_runtime_pm.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/intel_runtime_pm.h
rename to drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
diff --git a/drivers/gpu/drm/xe/display/intel_wakeref.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/intel_wakeref.h
rename to drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
-- 
2.39.1