2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 5e539fc5b05f..e80fc38141b5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -778,10 +778,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
         struct amdgpu_bo *bo;
         int i, r;
 
-        r = amdgpu_vm_update_directories(adev, vm);
-        if (r)
-                return r;
-
         r = amdgpu_vm_clear_freed(adev, vm, NULL);
         if (r)
                 return r;
@@ -839,6 +835,10 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
         if (r)
                 return r;
 
+        r = amdgpu_vm_update_directories(adev, vm);
+        if (r)
+                return r;
+
         r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_update, false);
         if (r)
                 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 10805edcf964..e48b4ec88c8c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -518,10 +518,6 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
         if (!amdgpu_vm_ready(vm))
                 return;
 
-        r = amdgpu_vm_update_directories(adev, vm);
-        if (r)
-                goto error;
-
         r = amdgpu_vm_clear_freed(adev, vm, NULL);
         if (r)
                 goto error;
@@ -530,6 +526,10 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
             operation == AMDGPU_VA_OP_REPLACE)
                 r = amdgpu_vm_bo_update(adev, bo_va, false);
 
+        r = amdgpu_vm_update_directories(adev, vm);
+        if (r)
+                goto error;
+
 error:
         if (r && r != -ERESTARTSYS)
                 DRM_ERROR("Couldn't update BO_VA (%d)\n", r);