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

drm/xe: Rename exec_queue_kill_compute to xe_vm_remove_compute_exec_queue

Browse Source 
Much better name and aligns with xe_vm_add_compute_exec_queue. As part
of the rename, move the implementation from xe_exec_queue.c to xe_vm.c.

Suggested-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Matthew Brost 2023-09-20 15:29:29 -04:00 committed by Rodrigo Vivi
parent e05c6c9774
commit abce4e4b07
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/xe/xe_exec_queue.c
View File

@ -775,22 +775,6 @@ int xe_exec_queue_get_property_ioctl(struct drm_device *dev, void *data,
return ret;
}
static void exec_queue_kill_compute(struct xe_exec_queue *q)
{
if (!xe_vm_in_compute_mode(q->vm))
return;
down_write(&q->vm->lock);
list_del(&q->compute.link);
--q->vm->preempt.num_exec_queues;
if (q->compute.pfence) {
dma_fence_enable_sw_signaling(q->compute.pfence);
dma_fence_put(q->compute.pfence);
q->compute.pfence = NULL;
}
up_write(&q->vm->lock);
}
/**
* xe_exec_queue_is_lr() - Whether an exec_queue is long-running
* @q: The exec_queue
@ -861,11 +845,11 @@ void xe_exec_queue_kill(struct xe_exec_queue *q)
list_for_each_entry_safe(eq, next, &eq->multi_gt_list,
multi_gt_link) {
q->ops->kill(eq);
exec_queue_kill_compute(eq);
xe_vm_remove_compute_exec_queue(q->vm, eq);
}
q->ops->kill(q);
exec_queue_kill_compute(q);
xe_vm_remove_compute_exec_queue(q->vm, q);
}
int xe_exec_queue_destroy_ioctl(struct drm_device *dev, void *data,

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

@ -387,6 +387,27 @@ out_unlock:
return err;
}
/**
* xe_vm_remove_compute_exec_queue() - Remove compute exec queue from VM
* @vm: The VM.
* @q: The exec_queue
*/
void xe_vm_remove_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
{
if (!xe_vm_in_compute_mode(vm))
return;
down_write(&vm->lock);
list_del(&q->compute.link);
--vm->preempt.num_exec_queues;
if (q->compute.pfence) {
dma_fence_enable_sw_signaling(q->compute.pfence);
dma_fence_put(q->compute.pfence);
q->compute.pfence = NULL;
}
up_write(&vm->lock);
}
/**
* __xe_vm_userptr_needs_repin() - Check whether the VM does have userptrs
* that need repinning.

1
drivers/gpu/drm/xe/xe_vm.h
View File

@ -165,6 +165,7 @@ static inline bool xe_vm_no_dma_fences(struct xe_vm *vm)
}
int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q);
void xe_vm_remove_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q);
int xe_vm_userptr_pin(struct xe_vm *vm);