diff options
| author | Dave Airlie <[email protected]> | 2016-07-08 13:29:32 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-07-08 13:29:32 +1000 |
| commit | ccd0e7887b7920e5c8a198eb9600ae26f13d631a (patch) | |
| tree | d47d807fcb85b76f970e979c2d63d5b421fd1c5e | |
| parent | 5dd0775e502b26b44e5bcb5f504a977a565f2f3e (diff) | |
| parent | 7fd5e03ca6b41a591bd9fda083362b8a07cfb5f7 (diff) | |
Merge tag 'drm-amdkfd-next-2016-07-03' of git://people.freedesktop.org/~gabbayo/linux into drm-next
A few amdkfd patches for 4.8. One patch replaces deprecated kernel api call
(create_workqueue) and the other patch properly cleans up resources in case of
failing to create a process object.
* tag 'drm-amdkfd-next-2016-07-03' of git://people.freedesktop.org/~gabbayo/linux:
drm/amdkfd: destroy mutex if process creation fails
drm/amdkfd: Remove create_workqueue()
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 7708d90b9da9..4f3849ac8c07 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -63,13 +63,12 @@ static struct kfd_process *create_process(const struct task_struct *thread); void kfd_process_create_wq(void) { if (!kfd_process_wq) - kfd_process_wq = create_workqueue("kfd_process_wq"); + kfd_process_wq = alloc_workqueue("kfd_process_wq", 0, 0); } void kfd_process_destroy_wq(void) { if (kfd_process_wq) { - flush_workqueue(kfd_process_wq); destroy_workqueue(kfd_process_wq); kfd_process_wq = NULL; } @@ -330,6 +329,7 @@ err_process_pqm_init: synchronize_rcu(); mmu_notifier_unregister_no_release(&process->mmu_notifier, process->mm); err_mmu_notifier: + mutex_destroy(&process->mutex); kfd_pasid_free(process->pasid); err_alloc_pasid: kfree(process->queues); |