mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/xe: Add some members to xe_vma_ops

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

v2:
 - Rebase

Cc: Oak Zeng <oak.zeng@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Oak Zeng <oak.zeng@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425045513.1913039-9-matthew.brost@intel.com
This commit is contained in:
Matthew Brost
2024-04-24 21:55:08 -07:00
parent bf69918b71
commit 22cfdd2865
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/xe/xe_vm.c
View File

@@ -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,
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)
{
@@ -760,7 +762,7 @@ int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker)
list_empty(&vm->rebind_list))
return 0;
xe_vma_ops_init(&vops);
xe_vma_ops_init(&vops, vm, NULL, NULL, 0);
xe_vm_assert_held(vm);
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
xe_vm_assert_held(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);
if (err)
@@ -3014,9 +3016,16 @@ static int vm_bind_ioctl_signal_fences(struct xe_vm *vm,
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);
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)
@@ -3183,7 +3192,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
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) {
u64 range = bind_ops[i].range;
u64 addr = bind_ops[i].addr;

8
drivers/gpu/drm/xe/xe_vm_types.h
View File

@@ -360,6 +360,14 @@ struct xe_vma_op {
struct xe_vma_ops {
/** @list: list of VMA operations */
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