From dad3f4684bf7d258ae89809459e943924f7b145e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 3 Jan 2018 13:36:22 +0100 Subject: [PATCH 3074/4131] drm/amdgpu: optimize moved handling only when vm_debug is inactive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we would completely circumvent that debugging feature. Signed-off-by: Christian König Reviewed-by: Roger He --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 7d4eedc..1b94caa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1716,7 +1716,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, if (resv == vm->root.base.bo->tbo.resv) clear = false; /* Try to reserve the BO to avoid clearing its ptes */ - else if (reservation_object_trylock(resv)) + else if (!amdgpu_vm_debug && reservation_object_trylock(resv)) clear = false; /* Somebody else is using the BO right now */ else -- 2.7.4