drm/amdgpu: optimize moved handling only when vm_debug is inactive

Otherwise we would completely circumvent that debugging feature.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 81505870eebc41283e920ccd91f06ba7ebe944e5..cd1752b6afa97c63a798d9b534f9e14653502127 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1685,7 +1685,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