drm/xe: Invalidate media_gt TLBs

Testing on LNL has shown media TLBs need to be invalidated via the GuC,
update xe_vm_invalidate_vma appropriately.

v2: Fix 2 tile case
v3: Include missing local change

Fixes: 3330361543fc ("drm/xe/lnl: Add LNL platform definition")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240820160129.986889-1-matthew.brost@intel.com
(cherry picked from commit 77cc3f6c58b1b28cee73904946c46a1415187d04)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index c7561a5..50e8fc4 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -3341,9 +3341,10 @@ int xe_vm_invalidate_vma(struct xe_vma *vma)
 {
        struct xe_device *xe = xe_vma_vm(vma)->xe;
        struct xe_tile *tile;
-       struct xe_gt_tlb_invalidation_fence fence[XE_MAX_TILES_PER_DEVICE];
-       u32 tile_needs_invalidate = 0;
+       struct xe_gt_tlb_invalidation_fence
+               fence[XE_MAX_TILES_PER_DEVICE * XE_MAX_GT_PER_TILE];
        u8 id;
+       u32 fence_id = 0;
        int ret = 0;
 
        xe_assert(xe, !xe_vma_is_null(vma));
@@ -3371,27 +3372,37 @@ int xe_vm_invalidate_vma(struct xe_vma *vma)
                if (xe_pt_zap_ptes(tile, vma)) {
                        xe_device_wmb(xe);
                        xe_gt_tlb_invalidation_fence_init(tile->primary_gt,
-                                                         &fence[id], true);
+                                                         &fence[fence_id],
+                                                         true);
 
-                       /*
-                        * FIXME: We potentially need to invalidate multiple
-                        * GTs within the tile
-                        */
                        ret = xe_gt_tlb_invalidation_vma(tile->primary_gt,
-                                                        &fence[id], vma);
+                                                        &fence[fence_id], vma);
                        if (ret < 0) {
-                               xe_gt_tlb_invalidation_fence_fini(&fence[id]);
+                               xe_gt_tlb_invalidation_fence_fini(&fence[fence_id]);
                                goto wait;
                        }
+                       ++fence_id;
 
-                       tile_needs_invalidate |= BIT(id);
+                       if (!tile->media_gt)
+                               continue;
+
+                       xe_gt_tlb_invalidation_fence_init(tile->media_gt,
+                                                         &fence[fence_id],
+                                                         true);
+
+                       ret = xe_gt_tlb_invalidation_vma(tile->media_gt,
+                                                        &fence[fence_id], vma);
+                       if (ret < 0) {
+                               xe_gt_tlb_invalidation_fence_fini(&fence[fence_id]);
+                               goto wait;
+                       }
+                       ++fence_id;
                }
        }
 
 wait:
-       for_each_tile(tile, xe, id)
-               if (tile_needs_invalidate & BIT(id))
-                       xe_gt_tlb_invalidation_fence_wait(&fence[id]);
+       for (id = 0; id < fence_id; ++id)
+               xe_gt_tlb_invalidation_fence_wait(&fence[id]);
 
        vma->tile_invalidated = vma->tile_mask;