drm/xe/ggtt: fix alignment usage for DG2

Spec says we need to use 64K VRAM pages for GGTT on platforms like DG2.
In GGTT this just means aligning the GTT address to 64K and ensuring
that we have 16 consecutive entries each pointing to the respective 4K
entry. We already ensure we have 64K pages underneath, so it's just a
case of forcing the GTT alignment.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index b1b9fc57a5db169c5d4640f1d8e4732b89c21158..e9273b5d2a9f2090010d65082f0064b636b40a59 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -108,6 +108,9 @@ int xe_ggtt_init_noalloc(struct xe_gt *gt, struct xe_ggtt *ggtt)
        ggtt->gsm = gt->mmio.regs + SZ_8M;
        ggtt->size = (gsm_size / 8) * (u64)GEN8_PAGE_SIZE;
 
+       if (IS_DGFX(xe) && xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K)
+               ggtt->flags |= XE_GGTT_FLAGS_64K;
+
        /*
         * 8B per entry, each points to a 4KB page.
         *
@@ -256,7 +259,8 @@ void xe_ggtt_map_bo(struct xe_ggtt *ggtt, struct xe_bo *bo)
        xe_ggtt_invalidate(ggtt->gt);
 }
 
-static int __xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 start, u64 end)
+static int __xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo,
+                                 u64 start, u64 end, u64 alignment)
 {
        int err;
 
@@ -271,7 +275,8 @@ static int __xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 st
                return err;
 
        mutex_lock(&ggtt->lock);
-       err = drm_mm_insert_node_in_range(&ggtt->mm, &bo->ggtt_node, bo->size, 0, 0, start, end, 0);
+       err = drm_mm_insert_node_in_range(&ggtt->mm, &bo->ggtt_node, bo->size,
+                                         alignment, 0, start, end, 0);
        if (!err)
                xe_ggtt_map_bo(ggtt, bo);
        mutex_unlock(&ggtt->lock);
@@ -281,12 +286,24 @@ static int __xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 st
 
 int xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 ofs)
 {
-       return __xe_ggtt_insert_bo_at(ggtt, bo, ofs, ofs + bo->size);
+       if (xe_bo_is_vram(bo) && ggtt->flags & XE_GGTT_FLAGS_64K) {
+               if (XE_WARN_ON(!IS_ALIGNED(ofs, SZ_64K)) ||
+                   XE_WARN_ON(!IS_ALIGNED(bo->size, SZ_64K)))
+                       return -EINVAL;
+       }
+
+       return __xe_ggtt_insert_bo_at(ggtt, bo, ofs, ofs + bo->size, 0);
 }
 
 int xe_ggtt_insert_bo(struct xe_ggtt *ggtt, struct xe_bo *bo)
 {
-       return __xe_ggtt_insert_bo_at(ggtt, bo, 0, U64_MAX);
+       u64 alignment;
+
+       alignment = GEN8_PAGE_SIZE;
+       if (xe_bo_is_vram(bo) && ggtt->flags & XE_GGTT_FLAGS_64K)
+               alignment = SZ_64K;
+
+       return __xe_ggtt_insert_bo_at(ggtt, bo, 0, U64_MAX, alignment);
 }
 
 void xe_ggtt_remove_node(struct xe_ggtt *ggtt, struct drm_mm_node *node)

diff --git a/drivers/gpu/drm/xe/xe_ggtt_types.h b/drivers/gpu/drm/xe/xe_ggtt_types.h
index e0419300176312d59bf448b5abb2864db0789dbd..ea70aaef4b3178030b00205f7afc5c8fbfe66cca 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt_types.h
+++ b/drivers/gpu/drm/xe/xe_ggtt_types.h
@@ -16,6 +16,9 @@ struct xe_ggtt {
 
        u64 size;
 
+#define XE_GGTT_FLAGS_64K BIT(0)
+       unsigned int flags;
+
        struct xe_bo *scratch;
 
        struct mutex lock;