[Intel-xe] [PATCH 1/2] DUMMY COMMIT. REMOVE AT NEXT REBASE.

Jani Nikula jani.nikula at intel.com
Wed May 10 15:46:43 UTC 2023


"drm/i915/display: Remaining changes to make xe compile" adds these
lines, and "drm/xe: Introduce a new DRM driver for Intel GPUs" removes
them again. There's no point in the back and forth.

Need to temporarily add this back to create a fixup commit to remove
them from "drm/i915/display: Remaining changes to make xe compile".

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/i915_reg_defs.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_reg_defs.h b/drivers/gpu/drm/i915/i915_reg_defs.h
index eac5a4141bfa..a7c4101370ad 100644
--- a/drivers/gpu/drm/i915/i915_reg_defs.h
+++ b/drivers/gpu/drm/i915/i915_reg_defs.h
@@ -218,9 +218,13 @@ typedef struct {
 
 #define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
 
+#ifdef I915
 typedef struct {
 	u32 reg;
 } i915_mcr_reg_t;
+#else
+#define i915_mcr_reg_t i915_reg_t
+#endif
 
 #define MCR_REG(offset)	((const i915_mcr_reg_t){ .reg = (offset) })
 
-- 
2.39.2



More information about the Intel-xe mailing list