drm/xe: Invalidate media_gt TLBs
Subsystems (2)
Matthew Brost
maintainerPATCH v3 1/1 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 changm
Fixes 3330361543fc ("drm/xe/lnl: Add LNL platform definition")
Signed-off-by Matthew Brost <[email protected]>
Reviewed-by Himal Prasad Ghimiray <[email protected]>
--- drivers/gpu/drm/xe/xe_vm.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-)
drivers/gpu/drm/xe/xe_vm.c +25 -13
@@ -3158,8 +3158,8 @@ 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;int ret =0 ;
@@ -3185,30 +3185,42 @@ int xe_vm_invalidate_vma(struct xe_vma *vma) }for_each_tile (tile, xe, id) { +u32 fence_id = id *XE_MAX_TILES_PER_DEVICE ; +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; + +if (!tile->media_gt) +continue ; + +xe_gt_tlb_invalidation_fence_init (tile->media_gt, + &fence[fence_id], + true); - tile_needs_invalidate |=BIT (id); + 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 <XE_MAX_TILES_PER_DEVICE *XE_MAX_GT_PER_TILE ; ++id) +xe_gt_tlb_invalidation_fence_wait (&fence[id]); vma->tile_invalidated = vma->tile_mask;
Signature · 1 line
2.34.1