Commit 053499f7 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5f3c40e9

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+0 −16
Original line number Diff line number Diff line
@@ -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: