[Intel-xe] [PATCH v3 11/13] drm/xe: Add missing includes for i915_reg_defs.h and others

[Lucas De Marchi]

Several places were missing the i915_reg_defs.h include. Any place using
the i915_reg_t typedef or macros like _MMIO(), FIELD_PREP(), etc should
include the register defining them explicitly.

This has gone unnoticed due to the way the display is integrated. By
including the display headers the i915_reg_defs.h is indirectly
included. Also, although the Makefile tries to add more cflags for the
display part, it fails in doing so: those cflags are actually added to
the entire Makefile (see subdir-ccflags documentation).

This change is obtained by temporarily removing display from xe and
fixing the breakages.

Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
---
 drivers/gpu/drm/xe/xe_device.c       | 6 ++++--
 drivers/gpu/drm/xe/xe_display.h      | 5 +++++
 drivers/gpu/drm/xe/xe_gt_pagefault.c | 2 ++
 drivers/gpu/drm/xe/xe_gt_topology.c  | 2 ++
 drivers/gpu/drm/xe/xe_migrate.c      | 2 ++
 drivers/gpu/drm/xe/xe_pcode_api.h    | 2 ++
 drivers/gpu/drm/xe/xe_step.c         | 2 ++
 7 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 45e3c740fda2..8f2b2acd4024 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -31,6 +31,10 @@
 #include "xe_vm_madvise.h"
 #include "xe_wait_user_fence.h"
 
+#include "../i915/i915_reg_defs.h"
+
+#define SOFTWARE_FLAGS_SPR33         _MMIO(0x4F084)
+
 static int xe_file_open(struct drm_device *dev, struct drm_file *file)
 {
 	struct xe_file *xef;
@@ -405,8 +409,6 @@ static void device_kill_persitent_engines(struct xe_device *xe,
 	mutex_unlock(&xe->persitent_engines.lock);
 }
 
-#define SOFTWARE_FLAGS_SPR33         _MMIO(0x4F084)
-
 void xe_device_wmb(struct xe_device *xe)
 {
 	struct xe_gt *gt = xe_device_get_gt(xe, 0);
diff --git a/drivers/gpu/drm/xe/xe_display.h b/drivers/gpu/drm/xe/xe_display.h
index 03117a7067dc..41fd6ca3a025 100644
--- a/drivers/gpu/drm/xe/xe_display.h
+++ b/drivers/gpu/drm/xe/xe_display.h
@@ -44,6 +44,11 @@ void xe_display_pm_resume_early(struct xe_device *xe);
 void xe_display_pm_resume(struct xe_device *xe);
 
 #else
+
+#include <drm/drm_drv.h>
+
+#include "xe_device.h"
+
 static inline int
 xe_display_enable(struct pci_dev *pdev, struct drm_driver *driver) { return 0; };
 
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index 0e7047b89a83..19403dbea9f5 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -20,6 +20,8 @@
 #include "xe_trace.h"
 #include "xe_vm.h"
 
+#include "../i915/i915_reg_defs.h"
+
 struct pagefault {
 	u64 page_addr;
 	u32 asid;
diff --git a/drivers/gpu/drm/xe/xe_gt_topology.c b/drivers/gpu/drm/xe/xe_gt_topology.c
index e002d706d855..3f7510abfc26 100644
--- a/drivers/gpu/drm/xe/xe_gt_topology.c
+++ b/drivers/gpu/drm/xe/xe_gt_topology.c
@@ -10,6 +10,8 @@
 #include "xe_gt.h"
 #include "xe_mmio.h"
 
+#include "../i915/i915_reg_defs.h"
+
 #define XE_MAX_DSS_FUSE_BITS (32 * XE_MAX_DSS_FUSE_REGS)
 #define XE_MAX_EU_FUSE_BITS (32 * XE_MAX_EU_FUSE_REGS)
 
diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 6c0033cb238f..d845f7cadbd4 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -28,6 +28,8 @@
 #include "xe_trace.h"
 #include "xe_vm.h"
 
+#include "../i915/i915_reg_defs.h"
+
 /**
  * struct xe_migrate - migrate context.
  */
diff --git a/drivers/gpu/drm/xe/xe_pcode_api.h b/drivers/gpu/drm/xe/xe_pcode_api.h
index 0762c8a912c7..2103f684a8b5 100644
--- a/drivers/gpu/drm/xe/xe_pcode_api.h
+++ b/drivers/gpu/drm/xe/xe_pcode_api.h
@@ -5,6 +5,8 @@
 
 /* Internal to xe_pcode */
 
+#include "../i915/i915_reg_defs.h"
+
 #define PCODE_MAILBOX			_MMIO(0x138124)
 #define   PCODE_READY			REG_BIT(31)
 #define   PCODE_MB_PARAM2		REG_GENMASK(23, 16)
diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c
index ca77d0971529..e5e77cb9ea09 100644
--- a/drivers/gpu/drm/xe/xe_step.c
+++ b/drivers/gpu/drm/xe/xe_step.c
@@ -8,6 +8,8 @@
 #include "xe_device.h"
 #include "xe_platform_types.h"
 
+#include "../i915/i915_reg_defs.h"
+
 /*
  * Provide mapping between PCI's revision ID to the individual GMD
  * (Graphics/Media/Display) stepping values that can be compared numerically.
-- 
2.39.0