drm/amdgpu: fix initializing the VM last eviction counter

Close a very small window where something can go wrong.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Alex Deucher <alexander.deucher@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 9f4ff29df80de65acaa4a4cb84eccc7753429d09..04aa5a77e953ff037edfa948027d5743357e3bcc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1629,13 +1629,17 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                goto error_free_page_directory;
 
        r = amdgpu_vm_clear_bo(adev, vm, vm->page_directory);
-       amdgpu_bo_unreserve(vm->page_directory);
        if (r)
-               goto error_free_page_directory;
+               goto error_unreserve;
+
        vm->last_eviction_counter = atomic64_read(&adev->num_evictions);
+       amdgpu_bo_unreserve(vm->page_directory);
 
        return 0;
 
+error_unreserve:
+       amdgpu_bo_unreserve(vm->page_directory);
+
 error_free_page_directory:
        amdgpu_bo_unref(&vm->page_directory->shadow);
        amdgpu_bo_unref(&vm->page_directory);