Add (re)bind to SVM page fault handler. To facilitate add support
function to VM layer which (re)binds a SVM range. Also teach PT layer to
understand (re)binds of SVM ranges.

Signed-off-by: Matthew Brost <matthew.br...@intel.com>
---
 drivers/gpu/drm/xe/xe_pt.c       | 140 +++++++++++++++++++++++++++----
 drivers/gpu/drm/xe/xe_pt_types.h |   2 +
 drivers/gpu/drm/xe/xe_svm.c      |  45 +++++++++-
 drivers/gpu/drm/xe/xe_svm.h      |  11 +++
 drivers/gpu/drm/xe/xe_vm.c       |  80 ++++++++++++++++++
 drivers/gpu/drm/xe/xe_vm.h       |   5 ++
 drivers/gpu/drm/xe/xe_vm_types.h |  19 +++++
 7 files changed, 286 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index b2db79251825..d5e444af7e02 100644
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -587,6 +587,7 @@ static const struct xe_pt_walk_ops xe_pt_stage_bind_ops = {
  * range.
  * @tile: The tile we're building for.
  * @vma: The vma indicating the address range.
+ * @range: The range indicating the address range.
  * @entries: Storage for the update entries used for connecting the tree to
  * the main tree at commit time.
  * @num_entries: On output contains the number of @entries used.
@@ -602,6 +603,7 @@ static const struct xe_pt_walk_ops xe_pt_stage_bind_ops = {
  */
 static int
 xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma,
+                struct xe_svm_range *range,
                 struct xe_vm_pgtable_update *entries, u32 *num_entries)
 {
        struct xe_device *xe = tile_to_xe(tile);
@@ -618,7 +620,8 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma,
                .vm = xe_vma_vm(vma),
                .tile = tile,
                .curs = &curs,
-               .va_curs_start = xe_vma_start(vma),
+               .va_curs_start = range ? range->base.va.start :
+                       xe_vma_start(vma),
                .vma = vma,
                .wupd.entries = entries,
                .needs_64K = (xe_vma_vm(vma)->flags & XE_VM_FLAG_64K) && 
is_devmem,
@@ -671,7 +674,11 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma,
 
        xe_bo_assert_held(bo);
 
-       if (!xe_vma_is_null(vma)) {
+       if (range) {
+               xe_res_first_dma(range->base.dma_addr, 0,
+                                range->base.va.end - range->base.va.start,
+                                range->base.order, &curs);
+       } else if (!xe_vma_is_null(vma)) {
                if (xe_vma_is_userptr(vma))
                        xe_res_first_sg(to_userptr_vma(vma)->userptr.sg, 0,
                                        xe_vma_size(vma), &curs);
@@ -685,8 +692,10 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma,
                curs.size = xe_vma_size(vma);
        }
 
-       ret = xe_pt_walk_range(&pt->base, pt->level, xe_vma_start(vma),
-                              xe_vma_end(vma), &xe_walk.base);
+       ret = xe_pt_walk_range(&pt->base, pt->level,
+                              range ? range->base.va.start : xe_vma_start(vma),
+                              range ? range->base.va.end : xe_vma_end(vma),
+                              &xe_walk.base);
 
        *num_entries = xe_walk.wupd.num_used_entries;
        return ret;
@@ -902,7 +911,7 @@ static void xe_pt_commit_locks_assert(struct xe_vma *vma)
 
        lockdep_assert_held(&vm->lock);
 
-       if (!xe_vma_is_userptr(vma) && !xe_vma_is_null(vma))
+       if (!xe_vma_has_no_bo(vma))
                dma_resv_assert_held(xe_vma_bo(vma)->ttm.base.resv);
 
        xe_vm_assert_held(vm);
@@ -1004,12 +1013,13 @@ static void xe_pt_free_bind(struct xe_vm_pgtable_update 
*entries,
 
 static int
 xe_pt_prepare_bind(struct xe_tile *tile, struct xe_vma *vma,
+                  struct xe_svm_range *range,
                   struct xe_vm_pgtable_update *entries, u32 *num_entries)
 {
        int err;
 
        *num_entries = 0;
-       err = xe_pt_stage_bind(tile, vma, entries, num_entries);
+       err = xe_pt_stage_bind(tile, vma, range, entries, num_entries);
        if (!err)
                xe_tile_assert(tile, *num_entries);
 
@@ -1115,6 +1125,8 @@ static int op_add_deps(struct xe_vm *vm, struct xe_vma_op 
*op,
        case DRM_GPUVA_OP_PREFETCH:
                err = vma_add_deps(gpuva_to_vma(op->base.prefetch.va), job);
                break;
+       case DRM_GPUVA_OP_USER:
+               break;
        default:
                drm_warn(&vm->xe->drm, "NOT POSSIBLE");
        }
@@ -1339,6 +1351,34 @@ static int xe_pt_userptr_pre_commit(struct 
xe_migrate_pt_update *pt_update)
        return err;
 }
 
+static int xe_pt_svm_pre_commit(struct xe_migrate_pt_update *pt_update)
+{
+       struct xe_vm *vm = pt_update->vops->vm;
+       struct xe_vma_ops *vops = pt_update->vops;
+       struct xe_vma_op *op;
+       int err;
+
+       err = xe_pt_pre_commit(pt_update);
+       if (err)
+               return err;
+
+       xe_svm_notifier_lock(vm);
+
+       list_for_each_entry(op, &vops->list, link) {
+               struct xe_svm_range *range = op->map_range.range;
+
+               xe_assert(vm->xe, 
xe_vma_is_system_allocator(op->map_range.vma));
+               xe_assert(vm->xe, op->subop == XE_VMA_SUBOP_MAP_RANGE);
+
+               if (!xe_svm_range_pages_valid(range)) {
+                       xe_svm_notifier_unlock(vm);
+                       return -EAGAIN;
+               }
+       }
+
+       return 0;
+}
+
 struct invalidation_fence {
        struct xe_gt_tlb_invalidation_fence base;
        struct xe_gt *gt;
@@ -1632,12 +1672,12 @@ xe_pt_commit_prepare_unbind(struct xe_vma *vma,
 
 static void
 xe_pt_update_ops_rfence_interval(struct xe_vm_pgtable_update_ops 
*pt_update_ops,
-                                struct xe_vma *vma)
+                                u64 start, u64 end)
 {
+       u64 last;
        u32 current_op = pt_update_ops->current_op;
        struct xe_vm_pgtable_update_op *pt_op = &pt_update_ops->ops[current_op];
        int i, level = 0;
-       u64 start, last;
 
        for (i = 0; i < pt_op->num_entries; i++) {
                const struct xe_vm_pgtable_update *entry = &pt_op->entries[i];
@@ -1647,8 +1687,8 @@ xe_pt_update_ops_rfence_interval(struct 
xe_vm_pgtable_update_ops *pt_update_ops,
        }
 
        /* Greedy (non-optimal) calculation but simple */
-       start = ALIGN_DOWN(xe_vma_start(vma), 0x1ull << xe_pt_shift(level));
-       last = ALIGN(xe_vma_end(vma), 0x1ull << xe_pt_shift(level)) - 1;
+       start = ALIGN_DOWN(start, 0x1ull << xe_pt_shift(level));
+       last = ALIGN(end, 0x1ull << xe_pt_shift(level)) - 1;
 
        if (start < pt_update_ops->start)
                pt_update_ops->start = start;
@@ -1690,7 +1730,7 @@ static int bind_op_prepare(struct xe_vm *vm, struct 
xe_tile *tile,
        if (err)
                return err;
 
-       err = xe_pt_prepare_bind(tile, vma, pt_op->entries,
+       err = xe_pt_prepare_bind(tile, vma, NULL, pt_op->entries,
                                 &pt_op->num_entries);
        if (!err) {
                xe_tile_assert(tile, pt_op->num_entries <=
@@ -1698,7 +1738,9 @@ static int bind_op_prepare(struct xe_vm *vm, struct 
xe_tile *tile,
                xe_vm_dbg_print_entries(tile_to_xe(tile), pt_op->entries,
                                        pt_op->num_entries, true);
 
-               xe_pt_update_ops_rfence_interval(pt_update_ops, vma);
+               xe_pt_update_ops_rfence_interval(pt_update_ops,
+                                                xe_vma_start(vma),
+                                                xe_vma_end(vma));
                ++pt_update_ops->current_op;
                pt_update_ops->needs_userptr_lock |= xe_vma_is_userptr(vma);
 
@@ -1732,6 +1774,48 @@ static int bind_op_prepare(struct xe_vm *vm, struct 
xe_tile *tile,
        return err;
 }
 
+static int bind_range_prepare(struct xe_vm *vm, struct xe_tile *tile,
+                             struct xe_vm_pgtable_update_ops *pt_update_ops,
+                             struct xe_vma *vma, struct xe_svm_range *range)
+{
+       u32 current_op = pt_update_ops->current_op;
+       struct xe_vm_pgtable_update_op *pt_op = &pt_update_ops->ops[current_op];
+       int err;
+
+       xe_tile_assert(tile, xe_vma_is_system_allocator(vma));
+
+       vm_dbg(&xe_vma_vm(vma)->xe->drm,
+              "Preparing bind, with range [%llx...%llx)\n",
+              range->base.va.start, range->base.va.end - 1);
+
+       pt_op->vma = NULL;
+       pt_op->bind = true;
+       pt_op->rebind = BIT(tile->id) & range->tile_present;
+
+       err = xe_pt_prepare_bind(tile, vma, range, pt_op->entries,
+                                &pt_op->num_entries);
+       if (!err) {
+               xe_tile_assert(tile, pt_op->num_entries <=
+                              ARRAY_SIZE(pt_op->entries));
+               xe_vm_dbg_print_entries(tile_to_xe(tile), pt_op->entries,
+                                       pt_op->num_entries, true);
+
+               xe_pt_update_ops_rfence_interval(pt_update_ops,
+                                                range->base.va.start,
+                                                range->base.va.end);
+               ++pt_update_ops->current_op;
+               pt_update_ops->needs_svm_lock = true;
+
+               pt_op->vma = vma;
+               xe_pt_commit_prepare_bind(vma, pt_op->entries,
+                                         pt_op->num_entries, pt_op->rebind);
+       } else {
+               xe_pt_cancel_bind(vma, pt_op->entries, pt_op->num_entries);
+       }
+
+       return err;
+}
+
 static int unbind_op_prepare(struct xe_tile *tile,
                             struct xe_vm_pgtable_update_ops *pt_update_ops,
                             struct xe_vma *vma)
@@ -1769,7 +1853,8 @@ static int unbind_op_prepare(struct xe_tile *tile,
 
        xe_vm_dbg_print_entries(tile_to_xe(tile), pt_op->entries,
                                pt_op->num_entries, false);
-       xe_pt_update_ops_rfence_interval(pt_update_ops, vma);
+       xe_pt_update_ops_rfence_interval(pt_update_ops, xe_vma_start(vma),
+                                        xe_vma_end(vma));
        ++pt_update_ops->current_op;
        pt_update_ops->needs_userptr_lock |= xe_vma_is_userptr(vma);
        pt_update_ops->needs_invalidation = true;
@@ -1839,6 +1924,15 @@ static int op_prepare(struct xe_vm *vm,
                pt_update_ops->wait_vm_kernel = true;
                break;
        }
+       case DRM_GPUVA_OP_USER:
+               if (op->subop == XE_VMA_SUBOP_MAP_RANGE) {
+                       xe_assert(vm->xe, 
xe_vma_is_system_allocator(op->map_range.vma));
+
+                       err = bind_range_prepare(vm, tile, pt_update_ops,
+                                                op->map_range.vma,
+                                                op->map_range.range);
+               }
+               break;
        default:
                drm_warn(&vm->xe->drm, "NOT POSSIBLE");
        }
@@ -2020,6 +2114,14 @@ static void op_commit(struct xe_vm *vm,
                                       fence2);
                break;
        }
+       case DRM_GPUVA_OP_USER:
+       {
+               if (op->subop == XE_VMA_SUBOP_MAP_RANGE) {
+                       op->map_range.range->tile_present |= BIT(tile->id);
+                       op->map_range.range->tile_invalidated &= ~BIT(tile->id);
+               }
+               break;
+       }
        default:
                drm_warn(&vm->xe->drm, "NOT POSSIBLE");
        }
@@ -2037,6 +2139,12 @@ static const struct xe_migrate_pt_update_ops 
userptr_migrate_ops = {
        .pre_commit = xe_pt_userptr_pre_commit,
 };
 
+static const struct xe_migrate_pt_update_ops svm_migrate_ops = {
+       .populate = xe_vm_populate_pgtable,
+       .clear = xe_migrate_clear_pgtable_callback,
+       .pre_commit = xe_pt_svm_pre_commit,
+};
+
 /**
  * xe_pt_update_ops_run() - Run PT update operations
  * @tile: Tile of PT update operations
@@ -2062,7 +2170,9 @@ xe_pt_update_ops_run(struct xe_tile *tile, struct 
xe_vma_ops *vops)
        struct xe_vma_op *op;
        int err = 0, i;
        struct xe_migrate_pt_update update = {
-               .ops = pt_update_ops->needs_userptr_lock ?
+               .ops = pt_update_ops->needs_svm_lock ?
+                       &svm_migrate_ops :
+                       pt_update_ops->needs_userptr_lock ?
                        &userptr_migrate_ops :
                        &migrate_ops,
                .vops = vops,
@@ -2183,6 +2293,8 @@ xe_pt_update_ops_run(struct xe_tile *tile, struct 
xe_vma_ops *vops)
                                  &ifence->base.base, &mfence->base.base);
        }
 
+       if (pt_update_ops->needs_svm_lock)
+               xe_svm_notifier_unlock(vm);
        if (pt_update_ops->needs_userptr_lock)
                up_read(&vm->userptr.notifier_lock);
 
diff --git a/drivers/gpu/drm/xe/xe_pt_types.h b/drivers/gpu/drm/xe/xe_pt_types.h
index 384cc04de719..69eab6f37cfe 100644
--- a/drivers/gpu/drm/xe/xe_pt_types.h
+++ b/drivers/gpu/drm/xe/xe_pt_types.h
@@ -104,6 +104,8 @@ struct xe_vm_pgtable_update_ops {
        u32 num_ops;
        /** @current_op: current operations */
        u32 current_op;
+       /** @needs_svm_lock: Needs SVM lock */
+       bool needs_svm_lock;
        /** @needs_userptr_lock: Needs userptr lock */
        bool needs_userptr_lock;
        /** @needs_invalidation: Needs invalidation */
diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c
index 3ac84f9615e2..28d139b3dbb7 100644
--- a/drivers/gpu/drm/xe/xe_svm.c
+++ b/drivers/gpu/drm/xe/xe_svm.c
@@ -210,12 +210,22 @@ void xe_svm_fini(struct xe_vm *vm)
        drm_gpusvm_fini(&vm->svm.gpusvm);
 }
 
+static bool xe_svm_range_is_valid(struct xe_svm_range *range,
+                                 struct xe_tile *tile)
+{
+       return (range->tile_present & ~range->tile_invalidated) & BIT(tile->id);
+}
+
 int xe_svm_handle_pagefault(struct xe_vm *vm, struct xe_vma *vma,
                            struct xe_tile *tile, u64 fault_addr,
                            bool atomic)
 {
        struct drm_gpusvm_ctx ctx = { .read_only = xe_vma_read_only(vma), };
+       struct xe_svm_range *range;
        struct drm_gpusvm_range *r;
+       struct drm_exec exec;
+       struct dma_fence *fence;
+       ktime_t end = 0;
        int err;
 
        lockdep_assert_held_write(&vm->lock);
@@ -229,11 +239,42 @@ int xe_svm_handle_pagefault(struct xe_vm *vm, struct 
xe_vma *vma,
        if (IS_ERR(r))
                return PTR_ERR(r);
 
-       err = drm_gpusvm_range_get_pages(&vm->svm.gpusvm, r, false);
+       range = to_xe_range(r);
+       if (xe_svm_range_is_valid(range, tile))
+               return 0;
+
+       err = drm_gpusvm_range_get_pages(&vm->svm.gpusvm, r, &ctx);
        if (err == -EFAULT || err == -EPERM)    /* Corner where CPU mappings 
have change */
               goto retry;
+       if (err)
+               goto err_out;
+
+retry_bind:
+       drm_exec_init(&exec, 0, 0);
+       drm_exec_until_all_locked(&exec) {
+               err = drm_exec_lock_obj(&exec, vm->gpuvm.r_obj);
+               drm_exec_retry_on_contention(&exec);
+               if (err) {
+                       drm_exec_fini(&exec);
+                       goto err_out;
+               }
+
+               fence = xe_vm_range_rebind(vm, vma, range, BIT(tile->id));
+               if (IS_ERR(fence)) {
+                       drm_exec_fini(&exec);
+                       err = PTR_ERR(fence);
+                       if (err == -EAGAIN)
+                               goto retry;
+                       if (xe_vm_validate_should_retry(&exec, err, &end))
+                               goto retry_bind;
+                       goto err_out;
+               }
+       }
+       drm_exec_fini(&exec);
 
-       /* TODO: Issue bind */
+       dma_fence_wait(fence, false);
+       dma_fence_put(fence);
 
+err_out:
        return err;
 }
diff --git a/drivers/gpu/drm/xe/xe_svm.h b/drivers/gpu/drm/xe/xe_svm.h
index b053b11692f0..7dabffaf4c65 100644
--- a/drivers/gpu/drm/xe/xe_svm.h
+++ b/drivers/gpu/drm/xe/xe_svm.h
@@ -25,4 +25,15 @@ int xe_svm_handle_pagefault(struct xe_vm *vm, struct xe_vma 
*vma,
                            struct xe_tile *tile, u64 fault_addr,
                            bool atomic);
 
+static inline bool xe_svm_range_pages_valid(struct xe_svm_range *range)
+{
+       return drm_gpusvm_range_pages_valid(range->base.gpusvm, &range->base);
+}
+
+#define xe_svm_notifier_lock(vm__)     \
+       drm_gpusvm_notifier_lock(&(vm__)->svm.gpusvm)
+
+#define xe_svm_notifier_unlock(vm__)   \
+       drm_gpusvm_notifier_unlock(&(vm__)->svm.gpusvm)
+
 #endif
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 17ad6a533b2f..6261a4cb2e1d 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -894,6 +894,84 @@ struct dma_fence *xe_vma_rebind(struct xe_vm *vm, struct 
xe_vma *vma, u8 tile_ma
        return fence;
 }
 
+static void xe_vm_populate_range_rebind(struct xe_vma_op *op,
+                                       struct xe_vma *vma,
+                                       struct xe_svm_range *range,
+                                       u8 tile_mask)
+{
+       INIT_LIST_HEAD(&op->link);
+       op->tile_mask = tile_mask;
+       op->base.op = DRM_GPUVA_OP_USER;
+       op->subop = XE_VMA_SUBOP_MAP_RANGE;
+       op->map_range.vma = vma;
+       op->map_range.range = range;
+}
+
+static int
+xe_vm_ops_add_range_rebind(struct xe_vma_ops *vops,
+                          struct xe_vma *vma,
+                          struct xe_svm_range *range,
+                          u8 tile_mask)
+{
+       struct xe_vma_op *op;
+
+       op = kzalloc(sizeof(*op), GFP_KERNEL);
+       if (!op)
+               return -ENOMEM;
+
+       xe_vm_populate_range_rebind(op, vma, range, tile_mask);
+       list_add_tail(&op->link, &vops->list);
+       xe_vma_ops_incr_pt_update_ops(vops, tile_mask);
+
+       return 0;
+}
+
+struct dma_fence *xe_vm_range_rebind(struct xe_vm *vm,
+                                    struct xe_vma *vma,
+                                    struct xe_svm_range *range,
+                                    u8 tile_mask)
+{
+       struct dma_fence *fence = NULL;
+       struct xe_vma_ops vops;
+       struct xe_vma_op *op, *next_op;
+       struct xe_tile *tile;
+       u8 id;
+       int err;
+
+       lockdep_assert_held(&vm->lock);
+       xe_vm_assert_held(vm);
+       xe_assert(vm->xe, xe_vm_in_fault_mode(vm));
+       xe_assert(vm->xe, xe_vma_is_system_allocator(vma));
+
+       xe_vma_ops_init(&vops, vm, NULL, NULL, 0);
+       for_each_tile(tile, vm->xe, id) {
+               vops.pt_update_ops[id].wait_vm_bookkeep = true;
+               vops.pt_update_ops[tile->id].q =
+                       xe_tile_migrate_exec_queue(tile);
+       }
+
+       err = xe_vm_ops_add_range_rebind(&vops, vma, range, tile_mask);
+       if (err)
+               return ERR_PTR(err);
+
+       err = xe_vma_ops_alloc(&vops, false);
+       if (err) {
+               fence = ERR_PTR(err);
+               goto free_ops;
+       }
+
+       fence = ops_execute(vm, &vops);
+
+free_ops:
+       list_for_each_entry_safe(op, next_op, &vops.list, link) {
+               list_del(&op->link);
+               kfree(op);
+       }
+       xe_vma_ops_fini(&vops);
+
+       return fence;
+}
+
 static void xe_vma_free(struct xe_vma *vma)
 {
        if (xe_vma_is_userptr(vma))
@@ -2516,6 +2594,8 @@ static void op_trace(struct xe_vma_op *op)
        case DRM_GPUVA_OP_PREFETCH:
                trace_xe_vma_bind(gpuva_to_vma(op->base.prefetch.va));
                break;
+       case DRM_GPUVA_OP_USER:
+               break;
        default:
                XE_WARN_ON("NOT POSSIBLE");
        }
diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h
index 1a5aed678214..8bd921b33090 100644
--- a/drivers/gpu/drm/xe/xe_vm.h
+++ b/drivers/gpu/drm/xe/xe_vm.h
@@ -22,6 +22,7 @@ struct ttm_validate_buffer;
 struct xe_exec_queue;
 struct xe_file;
 struct xe_sync_entry;
+struct xe_svm_range;
 struct drm_exec;
 
 struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags);
@@ -217,6 +218,10 @@ int xe_vm_userptr_check_repin(struct xe_vm *vm);
 int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker);
 struct dma_fence *xe_vma_rebind(struct xe_vm *vm, struct xe_vma *vma,
                                u8 tile_mask);
+struct dma_fence *xe_vm_range_rebind(struct xe_vm *vm,
+                                    struct xe_vma *vma,
+                                    struct xe_svm_range *range,
+                                    u8 tile_mask);
 
 int xe_vm_invalidate_vma(struct xe_vma *vma);
 
diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h
index bd1c0e368238..b736e53779d2 100644
--- a/drivers/gpu/drm/xe/xe_vm_types.h
+++ b/drivers/gpu/drm/xe/xe_vm_types.h
@@ -19,6 +19,7 @@
 #include "xe_range_fence.h"
 
 struct xe_bo;
+struct xe_svm_range;
 struct xe_sync_entry;
 struct xe_user_fence;
 struct xe_vm;
@@ -334,6 +335,14 @@ struct xe_vma_op_prefetch {
        u32 region;
 };
 
+/** struct xe_vma_op_map_range - VMA map range operation */
+struct xe_vma_op_map_range {
+       /** @vma: VMA to map (system allocator VMA) */
+       struct xe_vma *vma;
+       /** @range: SVM range to map */
+       struct xe_svm_range *range;
+};
+
 /** enum xe_vma_op_flags - flags for VMA operation */
 enum xe_vma_op_flags {
        /** @XE_VMA_OP_COMMITTED: VMA operation committed */
@@ -344,6 +353,12 @@ enum xe_vma_op_flags {
        XE_VMA_OP_NEXT_COMMITTED        = BIT(2),
 };
 
+/** enum xe_vma_subop - VMA sub-operation */
+enum xe_vma_subop {
+       /** @XE_VMA_SUBOP_MAP_RANGE: Map range */
+       XE_VMA_SUBOP_MAP_RANGE,
+};
+
 /** struct xe_vma_op - VMA operation */
 struct xe_vma_op {
        /** @base: GPUVA base operation */
@@ -352,6 +367,8 @@ struct xe_vma_op {
        struct list_head link;
        /** @flags: operation flags */
        enum xe_vma_op_flags flags;
+       /** @subop: user defined sub-operation */
+       enum xe_vma_subop subop;
        /** @tile_mask: Tile mask for operation */
        u8 tile_mask;
 
@@ -362,6 +379,8 @@ struct xe_vma_op {
                struct xe_vma_op_remap remap;
                /** @prefetch: VMA prefetch operation specific data */
                struct xe_vma_op_prefetch prefetch;
+               /** @map: VMA map range operation specific data */
+               struct xe_vma_op_map_range map_range;
        };
 };
 
-- 
2.34.1

Reply via email to