drm/xe: Reinstate pipelined fence enable_signaling

With the GPUVA conversion, the xe_bo::vmas member became replaced with
drm_gem_object::gpuva.list, however there was a couple of usage instances
left using the old member. Most notably the pipelined fence
enable_signaling.

Remove the xe_bo::vmas member completely, fix usage instances and
also enable this pipelined fence enable_signaling even for faulting
VM:s since we actually wait for bind fences to complete.

v2:
- Rebase.
v3:
- Fix display code build error.

Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230915172606.14436-1-thomas.hellstrom@linux.intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 998efce..e812f2b 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -456,7 +456,7 @@ static int xe_bo_trigger_rebind(struct xe_device *xe, struct xe_bo *bo,
 
        dma_resv_assert_held(bo->ttm.base.resv);
 
-       if (!xe_device_in_fault_mode(xe) && !list_empty(&bo->vmas)) {
+       if (!list_empty(&bo->ttm.base.gpuva.list)) {
                dma_resv_iter_begin(&cursor, bo->ttm.base.resv,
                                    DMA_RESV_USAGE_BOOKKEEP);
                dma_resv_for_each_fence_unlocked(&cursor, fence)
@@ -1049,7 +1049,7 @@ static void xe_ttm_bo_destroy(struct ttm_buffer_object *ttm_bo)
                drm_prime_gem_destroy(&bo->ttm.base, NULL);
        drm_gem_object_release(&bo->ttm.base);
 
-       xe_assert(xe, list_empty(&bo->vmas));
+       xe_assert(xe, list_empty(&ttm_bo->base.gpuva.list));
 
        if (bo->ggtt_node.size)
                xe_ggtt_remove_bo(bo->tile->mem.ggtt, bo);
@@ -1232,7 +1232,6 @@ struct xe_bo *__xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,
        bo->props.preferred_gt = XE_BO_PROPS_INVALID;
        bo->props.preferred_mem_type = XE_BO_PROPS_INVALID;
        bo->ttm.priority = DRM_XE_VMA_PRIORITY_NORMAL;
-       INIT_LIST_HEAD(&bo->vmas);
        INIT_LIST_HEAD(&bo->pinned_link);
 
        drm_gem_private_object_init(&xe->drm, &bo->ttm.base, size);

diff --git a/drivers/gpu/drm/xe/xe_bo_types.h b/drivers/gpu/drm/xe/xe_bo_types.h
index f6ee920..27fe721 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo_types.h
+++ b/drivers/gpu/drm/xe/xe_bo_types.h
@@ -31,8 +31,6 @@ struct xe_bo {
        struct xe_vm *vm;
        /** @tile: Tile this BO is attached to (kernel BO only) */
        struct xe_tile *tile;
-       /** @vmas: List of VMAs for this BO */
-       struct list_head vmas;
        /** @placements: valid placements for this BO */
        struct ttm_place placements[XE_BO_MAX_PLACEMENTS];
        /** @placement: current placement for this BO */

diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index 680fbe6..21a3dfe 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -265,7 +265,7 @@ void xe_pt_destroy(struct xe_pt *pt, u32 flags, struct llist_head *deferred)
        if (!pt)
                return;
 
-       XE_WARN_ON(!list_empty(&pt->bo->vmas));
+       XE_WARN_ON(!list_empty(&pt->bo->ttm.base.gpuva.list));
        xe_bo_unpin(pt->bo);
        xe_bo_put_deferred(pt->bo, deferred);