Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH 1/2] DUMMY COMMIT. REMOVE AT NEXT REBASE.
@ 2023-05-10 15:46 Jani Nikula
  2023-05-10 15:46 ` [Intel-xe] [PATCH 2/2] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Jani Nikula @ 2023-05-10 15:46 UTC (permalink / raw)
  To: intel-xe; +Cc: Jani Nikula, rodrigo.vivi

"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@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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-05-11 12:32 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-10 15:46 [Intel-xe] [PATCH 1/2] DUMMY COMMIT. REMOVE AT NEXT REBASE Jani Nikula
2023-05-10 15:46 ` [Intel-xe] [PATCH 2/2] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-05-10 20:29   ` Lucas De Marchi
2023-05-11 12:32     ` Jani Nikula
2023-05-10 15:53 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/2] DUMMY COMMIT. REMOVE AT NEXT REBASE Patchwork
2023-05-10 15:54 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-10 15:58 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-10 16:28 ` [Intel-xe] ○ CI.BAT: info " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox