diff options
| author | Alex Sierra <[email protected]> | 2021-09-30 10:38:08 -0500 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2021-10-13 14:14:34 -0400 |
| commit | 7e3fb209d518112628f3f5abd6e66053ac4b0767 (patch) | |
| tree | b5ba68fd036a65dc41b48352993c31666689a92b | |
| parent | 9c152f54d9f6abdc9dd0817d8634c3ea0842c1c4 (diff) | |
amd/amdkfd: remove svms declaration to avoid werror
svm_range_list svms declaration removed to avoid werror when
CONFIG_HSA_AMD_SVM is not enabled.
Signed-off-by: Alex Sierra <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 4de907f3e66a..f1e7edeb4e6b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1251,7 +1251,6 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep, struct kfd_process_device *pdd; void *mem; struct kfd_dev *dev; - struct svm_range_list *svms = &p->svms; int idr_handle; long err; uint64_t offset = args->mmap_offset; @@ -1264,18 +1263,18 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep, /* Flush pending deferred work to avoid racing with deferred actions * from previous memory map changes (e.g. munmap). */ - svm_range_list_lock_and_flush_work(svms, current->mm); - mutex_lock(&svms->lock); + svm_range_list_lock_and_flush_work(&p->svms, current->mm); + mutex_lock(&p->svms.lock); mmap_write_unlock(current->mm); - if (interval_tree_iter_first(&svms->objects, + if (interval_tree_iter_first(&p->svms.objects, args->va_addr >> PAGE_SHIFT, (args->va_addr + args->size - 1) >> PAGE_SHIFT)) { pr_err("Address: 0x%llx already allocated by SVM\n", args->va_addr); - mutex_unlock(&svms->lock); + mutex_unlock(&p->svms.lock); return -EADDRINUSE; } - mutex_unlock(&svms->lock); + mutex_unlock(&p->svms.lock); #endif dev = kfd_device_by_id(args->gpu_id); if (!dev) |