[Intel-xe] [PATCH 6/8] drm/xe: move all top level i915 compat headers to a separate subdirectory
Jani Nikula
jani.nikula at intel.com
Thu Mar 2 14:12:28 UTC 2023
Be more explicit about which headers override i915 top level headers.
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
drivers/gpu/drm/xe/Makefile | 6 ++++--
.../drm/xe/{display => compat-headers}/i915_active_types.h | 0
drivers/gpu/drm/xe/{display => compat-headers}/i915_drv.h | 0
drivers/gpu/drm/xe/{display => compat-headers}/i915_vma.h | 0
.../gpu/drm/xe/{display => compat-headers}/i915_vma_types.h | 0
.../gpu/drm/xe/{display => compat-headers}/intel_pm_types.h | 0
.../drm/xe/{display => compat-headers}/intel_runtime_pm.h | 0
.../gpu/drm/xe/{display => compat-headers}/intel_wakeref.h | 0
8 files changed, 4 insertions(+), 2 deletions(-)
rename drivers/gpu/drm/xe/{display => compat-headers}/i915_active_types.h (100%)
rename drivers/gpu/drm/xe/{display => compat-headers}/i915_drv.h (100%)
rename drivers/gpu/drm/xe/{display => compat-headers}/i915_vma.h (100%)
rename drivers/gpu/drm/xe/{display => compat-headers}/i915_vma_types.h (100%)
rename drivers/gpu/drm/xe/{display => compat-headers}/intel_pm_types.h (100%)
rename drivers/gpu/drm/xe/{display => compat-headers}/intel_runtime_pm.h (100%)
rename drivers/gpu/drm/xe/{display => compat-headers}/intel_wakeref.h (100%)
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 18257cd7227d..42a34597f16c 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -99,7 +99,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-headers \
-I$(srctree)/drivers/gpu/drm/xe/display/ \
-I$(srctree)/drivers/gpu/drm/i915/display/ \
-I$(srctree)/drivers/gpu/drm/i915/ \
@@ -220,7 +222,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-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-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-headers/i915_active_types.h
diff --git a/drivers/gpu/drm/xe/display/i915_drv.h b/drivers/gpu/drm/xe/compat-headers/i915_drv.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/i915_drv.h
rename to drivers/gpu/drm/xe/compat-headers/i915_drv.h
diff --git a/drivers/gpu/drm/xe/display/i915_vma.h b/drivers/gpu/drm/xe/compat-headers/i915_vma.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/i915_vma.h
rename to drivers/gpu/drm/xe/compat-headers/i915_vma.h
diff --git a/drivers/gpu/drm/xe/display/i915_vma_types.h b/drivers/gpu/drm/xe/compat-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-headers/i915_vma_types.h
diff --git a/drivers/gpu/drm/xe/display/intel_pm_types.h b/drivers/gpu/drm/xe/compat-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-headers/intel_pm_types.h
diff --git a/drivers/gpu/drm/xe/display/intel_runtime_pm.h b/drivers/gpu/drm/xe/compat-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-headers/intel_runtime_pm.h
diff --git a/drivers/gpu/drm/xe/display/intel_wakeref.h b/drivers/gpu/drm/xe/compat-headers/intel_wakeref.h
similarity index 100%
rename from drivers/gpu/drm/xe/display/intel_wakeref.h
rename to drivers/gpu/drm/xe/compat-headers/intel_wakeref.h
--
2.39.1
More information about the Intel-xe
mailing list