drm/xe: Move struct xe_ggtt to xe_ggtt.c

No users left outside of xe_ggtt.c, so we can make the struct private.

This prevents us from accidentally touching it before init.

Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patch.msgid.link/20260206112108.1453809-10-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>

diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index df9def284c28279e97243e204b06399f8f0e21cf..3ea94d9c257c354c48b47e4231e63246d3934220 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -84,6 +84,61 @@ struct xe_ggtt_node {
        bool invalidate_on_remove;
 };
 
+/**
+ * struct xe_ggtt_pt_ops - GGTT Page table operations
+ * Which can vary from platform to platform.
+ */
+struct xe_ggtt_pt_ops {
+       /** @pte_encode_flags: Encode PTE flags for a given BO */
+       u64 (*pte_encode_flags)(struct xe_bo *bo, u16 pat_index);
+
+       /** @ggtt_set_pte: Directly write into GGTT's PTE */
+       xe_ggtt_set_pte_fn ggtt_set_pte;
+
+       /** @ggtt_get_pte: Directly read from GGTT's PTE */
+       u64 (*ggtt_get_pte)(struct xe_ggtt *ggtt, u64 addr);
+};
+
+/**
+ * struct xe_ggtt - Main GGTT struct
+ *
+ * In general, each tile can contains its own Global Graphics Translation Table
+ * (GGTT) instance.
+ */
+struct xe_ggtt {
+       /** @tile: Back pointer to tile where this GGTT belongs */
+       struct xe_tile *tile;
+        /** @start: Start offset of GGTT */
+       u64 start;
+       /** @size: Total usable size of this GGTT */
+       u64 size;
+
+#define XE_GGTT_FLAGS_64K BIT(0)
+       /**
+        * @flags: Flags for this GGTT
+        * Acceptable flags:
+        * - %XE_GGTT_FLAGS_64K - if PTE size is 64K. Otherwise, regular is 4K.
+        */
+       unsigned int flags;
+       /** @scratch: Internal object allocation used as a scratch page */
+       struct xe_bo *scratch;
+       /** @lock: Mutex lock to protect GGTT data */
+       struct mutex lock;
+       /**
+        *  @gsm: The iomem pointer to the actual location of the translation
+        * table located in the GSM for easy PTE manipulation
+        */
+       u64 __iomem *gsm;
+       /** @pt_ops: Page Table operations per platform */
+       const struct xe_ggtt_pt_ops *pt_ops;
+       /** @mm: The memory manager used to manage individual GGTT allocations */
+       struct drm_mm mm;
+       /** @access_count: counts GGTT writes */
+       unsigned int access_count;
+       /** @wq: Dedicated unordered work queue to process node removals */
+       struct workqueue_struct *wq;
+};
+
 static u64 xelp_ggtt_pte_flags(struct xe_bo *bo, u16 pat_index)
 {
        u64 pte = XE_PAGE_PRESENT;

diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h
index 49ea8e7ecc10534133214d7bcd2120acc45f0d53..403eb5c0db49d496f9f79067e801707a732472e0 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.h
+++ b/drivers/gpu/drm/xe/xe_ggtt.h
@@ -9,6 +9,7 @@
 #include "xe_ggtt_types.h"
 
 struct drm_printer;
+struct xe_bo;
 struct xe_tile;
 struct drm_exec;
 

diff --git a/drivers/gpu/drm/xe/xe_ggtt_types.h b/drivers/gpu/drm/xe/xe_ggtt_types.h
index d82b71a198bc2bf6d7e697a441af9bed2c589011..cf754e4d502ad47abdddbd4369dd85f9863f309f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt_types.h
+++ b/drivers/gpu/drm/xe/xe_ggtt_types.h
@@ -6,72 +6,16 @@
 #ifndef _XE_GGTT_TYPES_H_
 #define _XE_GGTT_TYPES_H_
 
+#include <linux/types.h>
 #include <drm/drm_mm.h>
 
-#include "xe_pt_types.h"
-
-struct xe_bo;
+struct xe_ggtt;
 struct xe_ggtt_node;
-struct xe_gt;
-
-/**
- * struct xe_ggtt - Main GGTT struct
- *
- * In general, each tile can contains its own Global Graphics Translation Table
- * (GGTT) instance.
- */
-struct xe_ggtt {
-       /** @tile: Back pointer to tile where this GGTT belongs */
-       struct xe_tile *tile;
-       /** @start: Start offset of GGTT */
-       u64 start;
-       /** @size: Total usable size of this GGTT */
-       u64 size;
-
-#define XE_GGTT_FLAGS_64K BIT(0)
-       /**
-        * @flags: Flags for this GGTT
-        * Acceptable flags:
-        * - %XE_GGTT_FLAGS_64K - if PTE size is 64K. Otherwise, regular is 4K.
-        */
-       unsigned int flags;
-       /** @scratch: Internal object allocation used as a scratch page */
-       struct xe_bo *scratch;
-       /** @lock: Mutex lock to protect GGTT data */
-       struct mutex lock;
-       /**
-        *  @gsm: The iomem pointer to the actual location of the translation
-        * table located in the GSM for easy PTE manipulation
-        */
-       u64 __iomem *gsm;
-       /** @pt_ops: Page Table operations per platform */
-       const struct xe_ggtt_pt_ops *pt_ops;
-       /** @mm: The memory manager used to manage individual GGTT allocations */
-       struct drm_mm mm;
-       /** @access_count: counts GGTT writes */
-       unsigned int access_count;
-       /** @wq: Dedicated unordered work queue to process node removals */
-       struct workqueue_struct *wq;
-};
 
 typedef void (*xe_ggtt_set_pte_fn)(struct xe_ggtt *ggtt, u64 addr, u64 pte);
 typedef void (*xe_ggtt_transform_cb)(struct xe_ggtt *ggtt,
                                     struct xe_ggtt_node *node,
                                     u64 pte_flags,
                                     xe_ggtt_set_pte_fn set_pte, void *arg);
-/**
- * struct xe_ggtt_pt_ops - GGTT Page table operations
- * Which can vary from platform to platform.
- */
-struct xe_ggtt_pt_ops {
-       /** @pte_encode_flags: Encode PTE flags for a given BO */
-       u64 (*pte_encode_flags)(struct xe_bo *bo, u16 pat_index);
-
-       /** @ggtt_set_pte: Directly write into GGTT's PTE */
-       xe_ggtt_set_pte_fn ggtt_set_pte;
-
-       /** @ggtt_get_pte: Directly read from GGTT's PTE */
-       u64 (*ggtt_get_pte)(struct xe_ggtt *ggtt, u64 addr);
-};
 
 #endif