drm/xe: Add xe_ggtt_alloc

Instead of allocating inside xe_tile, create a new function that returns
an allocated struct xe_ggtt from xe_ggtt.c

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250505121924.921544-4-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 bf69737ed5ea88768c568b4c020edb35c4fde027..3e5641e0268bf3578763fdf5da906d5f5a2e100b 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -160,6 +160,22 @@ static void xe_ggtt_clear(struct xe_ggtt *ggtt, u64 start, u64 size)
        }
 }
 
+/**
+ * xe_ggtt_alloc - Allocate a GGTT for a given &xe_tile
+ * @tile: &xe_tile
+ *
+ * Allocates a &xe_ggtt for a given tile.
+ *
+ * Return: &xe_ggtt on success, or NULL when out of memory.
+ */
+struct xe_ggtt *xe_ggtt_alloc(struct xe_tile *tile)
+{
+       struct xe_ggtt *ggtt = drmm_kzalloc(&tile_to_xe(tile)->drm, sizeof(*ggtt), GFP_KERNEL);
+       if (ggtt)
+               ggtt->tile = tile;
+       return ggtt;
+}
+
 static void ggtt_fini_early(struct drm_device *drm, void *arg)
 {
        struct xe_ggtt *ggtt = arg;

diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h
index 58ba68d32f2e2d39040c4a0a8201b0d7583b93cc..ceae9a97d76e96c935750737bc9d5e72643b6162 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.h
+++ b/drivers/gpu/drm/xe/xe_ggtt.h
@@ -9,7 +9,9 @@
 #include "xe_ggtt_types.h"
 
 struct drm_printer;
+struct xe_tile;
 
+struct xe_ggtt *xe_ggtt_alloc(struct xe_tile *tile);
 int xe_ggtt_init_early(struct xe_ggtt *ggtt);
 int xe_ggtt_init(struct xe_ggtt *ggtt);
 

diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c
index 0771acbbf3676cc2c64247ac7b7d02e03f4ab062..672faa0b67f16933a44cc2626cec71e9be403a9c 100644 (file)
--- a/drivers/gpu/drm/xe/xe_tile.c
+++ b/drivers/gpu/drm/xe/xe_tile.c
@@ -87,13 +87,9 @@
  */
 static int xe_tile_alloc(struct xe_tile *tile)
 {
-       struct drm_device *drm = &tile_to_xe(tile)->drm;
-
-       tile->mem.ggtt = drmm_kzalloc(drm, sizeof(*tile->mem.ggtt),
-                                     GFP_KERNEL);
+       tile->mem.ggtt = xe_ggtt_alloc(tile);
        if (!tile->mem.ggtt)
                return -ENOMEM;
-       tile->mem.ggtt->tile = tile;
 
        return 0;
 }