Commit 22cfdd28 authored by Matthew Brost's avatar Matthew Brost

drm/xe: Add some members to xe_vma_ops

This will help with moving to single jobs for many bind operations.

v2:
 - Rebase

Cc: Oak Zeng <oak.zeng@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarOak Zeng <oak.zeng@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425045513.1913039-9-matthew.brost@intel.com
parent bf69918b
...@@ -745,7 +745,9 @@ static int xe_vm_ops_add_rebind(struct xe_vma_ops *vops, struct xe_vma *vma, ...@@ -745,7 +745,9 @@ static int xe_vm_ops_add_rebind(struct xe_vma_ops *vops, struct xe_vma *vma,
static struct dma_fence *ops_execute(struct xe_vm *vm, static struct dma_fence *ops_execute(struct xe_vm *vm,
struct xe_vma_ops *vops); struct xe_vma_ops *vops);
static void xe_vma_ops_init(struct xe_vma_ops *vops); static void xe_vma_ops_init(struct xe_vma_ops *vops, struct xe_vm *vm,
struct xe_exec_queue *q,
struct xe_sync_entry *syncs, u32 num_syncs);
int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker) int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker)
{ {
...@@ -760,7 +762,7 @@ int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker) ...@@ -760,7 +762,7 @@ int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker)
list_empty(&vm->rebind_list)) list_empty(&vm->rebind_list))
return 0; return 0;
xe_vma_ops_init(&vops); xe_vma_ops_init(&vops, vm, NULL, NULL, 0);
xe_vm_assert_held(vm); xe_vm_assert_held(vm);
list_for_each_entry(vma, &vm->rebind_list, combined_links.rebind) { list_for_each_entry(vma, &vm->rebind_list, combined_links.rebind) {
...@@ -806,7 +808,7 @@ struct dma_fence *xe_vma_rebind(struct xe_vm *vm, struct xe_vma *vma, u8 tile_ma ...@@ -806,7 +808,7 @@ struct dma_fence *xe_vma_rebind(struct xe_vm *vm, struct xe_vma *vma, u8 tile_ma
xe_vm_assert_held(vm); xe_vm_assert_held(vm);
xe_assert(vm->xe, xe_vm_in_fault_mode(vm)); xe_assert(vm->xe, xe_vm_in_fault_mode(vm));
xe_vma_ops_init(&vops); xe_vma_ops_init(&vops, vm, NULL, NULL, 0);
err = xe_vm_ops_add_rebind(&vops, vma, tile_mask); err = xe_vm_ops_add_rebind(&vops, vma, tile_mask);
if (err) if (err)
...@@ -3014,9 +3016,16 @@ static int vm_bind_ioctl_signal_fences(struct xe_vm *vm, ...@@ -3014,9 +3016,16 @@ static int vm_bind_ioctl_signal_fences(struct xe_vm *vm,
return err; return err;
} }
static void xe_vma_ops_init(struct xe_vma_ops *vops) static void xe_vma_ops_init(struct xe_vma_ops *vops, struct xe_vm *vm,
struct xe_exec_queue *q,
struct xe_sync_entry *syncs, u32 num_syncs)
{ {
memset(vops, 0, sizeof(*vops));
INIT_LIST_HEAD(&vops->list); INIT_LIST_HEAD(&vops->list);
vops->vm = vm;
vops->q = q;
vops->syncs = syncs;
vops->num_syncs = num_syncs;
} }
int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
...@@ -3183,7 +3192,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) ...@@ -3183,7 +3192,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
goto free_syncs; goto free_syncs;
} }
xe_vma_ops_init(&vops); xe_vma_ops_init(&vops, vm, q, syncs, num_syncs);
for (i = 0; i < args->num_binds; ++i) { for (i = 0; i < args->num_binds; ++i) {
u64 range = bind_ops[i].range; u64 range = bind_ops[i].range;
u64 addr = bind_ops[i].addr; u64 addr = bind_ops[i].addr;
......
...@@ -360,6 +360,14 @@ struct xe_vma_op { ...@@ -360,6 +360,14 @@ struct xe_vma_op {
struct xe_vma_ops { struct xe_vma_ops {
/** @list: list of VMA operations */ /** @list: list of VMA operations */
struct list_head list; struct list_head list;
/** @vm: VM */
struct xe_vm *vm;
/** @q: exec queue these operations */
struct xe_exec_queue *q;
/** @syncs: syncs these operation */
struct xe_sync_entry *syncs;
/** @num_syncs: number of syncs */
u32 num_syncs;
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment