drm/amdkfd: Remove legacy code not acquiring VMs

ROCm user mode has acquired VMs from DRM file descriptors for as long
as it supported the upstream KFD. Legacy code to support older versions
of ROCm is not needed any more.

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Philip Yang <Philip.Yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 14f68c02812686e46804f669a45696585fedb4f5..5ffb07b02810ef2be2d6f059234d3b91341b5dea 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -234,14 +234,10 @@ uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *s
        })
 
 /* GPUVM API */
-int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
-                                       void **vm, void **process_info,
-                                       struct dma_fence **ef);
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                                        struct file *filp, u32 pasid,
                                        void **vm, void **process_info,
                                        struct dma_fence **ef);
-void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);
 void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm);
 uint64_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm);
 int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 6622695a5eed10fa6780df99941aeced2a23d50f..7d4118c8128a54f131b3190b149ebe9062937f41 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1034,41 +1034,6 @@ create_evict_fence_fail:
        return ret;
 }
 
-int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
-                                         void **vm, void **process_info,
-                                         struct dma_fence **ef)
-{
-       struct amdgpu_device *adev = get_amdgpu_device(kgd);
-       struct amdgpu_vm *new_vm;
-       int ret;
-
-       new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL);
-       if (!new_vm)
-               return -ENOMEM;
-
-       /* Initialize AMDGPU part of the VM */
-       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, pasid);
-       if (ret) {
-               pr_err("Failed init vm ret %d\n", ret);
-               goto amdgpu_vm_init_fail;
-       }
-
-       /* Initialize KFD part of the VM and process info */
-       ret = init_kfd_vm(new_vm, process_info, ef);
-       if (ret)
-               goto init_kfd_vm_fail;
-
-       *vm = (void *) new_vm;
-
-       return 0;
-
-init_kfd_vm_fail:
-       amdgpu_vm_fini(adev, new_vm);
-amdgpu_vm_init_fail:
-       kfree(new_vm);
-       return ret;
-}
-
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                                           struct file *filp, u32 pasid,
                                           void **vm, void **process_info,
@@ -1135,21 +1100,6 @@ void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
        }
 }
 
-void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
-{
-       struct amdgpu_device *adev = get_amdgpu_device(kgd);
-       struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;
-
-       if (WARN_ON(!kgd || !vm))
-               return;
-
-       pr_debug("Destroying process vm %p\n", vm);
-
-       /* Release the VM context */
-       amdgpu_vm_fini(adev, avm);
-       kfree(vm);
-}
-
 void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index d4241d29ea94fa4afbd706e546a92d97e5a06733..d97e330a50221904cfe796f4763f1f970ae194d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -935,9 +935,6 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)
                                        pdd->dev->kgd, pdd->vm);
                        fput(pdd->drm_file);
                }
-               else if (pdd->vm)
-                       amdgpu_amdkfd_gpuvm_destroy_process_vm(
-                               pdd->dev->kgd, pdd->vm);
 
                if (pdd->qpd.cwsr_kaddr && !pdd->qpd.cwsr_base)
                        free_pages((unsigned long)pdd->qpd.cwsr_kaddr,
@@ -1375,19 +1372,18 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
        struct kfd_dev *dev;
        int ret;
 
+       if (!drm_file)
+               return -EINVAL;
+
        if (pdd->vm)
-               return drm_file ? -EBUSY : 0;
+               return -EBUSY;
 
        p = pdd->process;
        dev = pdd->dev;
 
-       if (drm_file)
-               ret = amdgpu_amdkfd_gpuvm_acquire_process_vm(
-                       dev->kgd, drm_file, p->pasid,
-                       &pdd->vm, &p->kgd_process_info, &p->ef);
-       else
-               ret = amdgpu_amdkfd_gpuvm_create_process_vm(dev->kgd, p->pasid,
-                       &pdd->vm, &p->kgd_process_info, &p->ef);
+       ret = amdgpu_amdkfd_gpuvm_acquire_process_vm(
+               dev->kgd, drm_file, p->pasid,
+               &pdd->vm, &p->kgd_process_info, &p->ef);
        if (ret) {
                pr_err("Failed to create process VM object\n");
                return ret;
@@ -1409,8 +1405,6 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
 err_init_cwsr:
 err_reserve_ib_mem:
        kfd_process_device_free_bos(pdd);
-       if (!drm_file)
-               amdgpu_amdkfd_gpuvm_destroy_process_vm(dev->kgd, pdd->vm);
        pdd->vm = NULL;
 
        return ret;
@@ -1435,6 +1429,9 @@ struct kfd_process_device *kfd_bind_process_to_device(struct kfd_dev *dev,
                return ERR_PTR(-ENOMEM);
        }
 
+       if (!pdd->vm)
+               return ERR_PTR(-ENODEV);
+
        /*
         * signal runtime-pm system to auto resume and prevent
         * further runtime suspend once device pdd is created until
@@ -1452,10 +1449,6 @@ struct kfd_process_device *kfd_bind_process_to_device(struct kfd_dev *dev,
        if (err)
                goto out;
 
-       err = kfd_process_device_init_vm(pdd, NULL);
-       if (err)
-               goto out;
-
        /*
         * make sure that runtime_usage counter is incremented just once
         * per pdd