diff options
| author | Christian König <christian.koenig@amd.com> | 2022-11-25 16:45:09 +0100 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-12-14 09:48:32 -0500 | 
| commit | 053499f7b45dc56758240615569b349fe9e2fc8d (patch) | |
| tree | 553a29d9be83b9edc176591b0a310549e03cc11e /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
| parent | 5f3c40e9e2460c42f5bf6c51b1e393d7159241c3 (diff) | |
drm/amdgpu: stop waiting for the VM during unreserve
This is completely pointless since the VMID always stays allocated until
the VM is idle.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 | 
1 files changed, 0 insertions, 16 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index a05cce3f3170..dc379dc22c77 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2368,7 +2368,6 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)  	union drm_amdgpu_vm *args = data;  	struct amdgpu_device *adev = drm_to_adev(dev);  	struct amdgpu_fpriv *fpriv = filp->driver_priv; -	long timeout = msecs_to_jiffies(2000);  	int r;  	switch (args->in.op) { @@ -2380,21 +2379,6 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)  			return r;  		break;  	case AMDGPU_VM_OP_UNRESERVE_VMID: -		if (amdgpu_sriov_runtime(adev)) -			timeout = 8 * timeout; - -		/* Wait vm idle to make sure the vmid set in SPM_VMID is -		 * not referenced anymore. -		 */ -		r = amdgpu_bo_reserve(fpriv->vm.root.bo, true); -		if (r) -			return r; - -		r = amdgpu_vm_wait_idle(&fpriv->vm, timeout); -		if (r < 0) -			return r; - -		amdgpu_bo_unreserve(fpriv->vm.root.bo);  		amdgpu_vmid_free_reserved(adev, &fpriv->vm, AMDGPU_GFXHUB_0);  		break;  	default: | 
