|
@@ -518,10 +518,6 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
|
|
if (!amdgpu_vm_ready(vm))
|
|
if (!amdgpu_vm_ready(vm))
|
|
return;
|
|
return;
|
|
|
|
|
|
- r = amdgpu_vm_update_directories(adev, vm);
|
|
|
|
- if (r)
|
|
|
|
- goto error;
|
|
|
|
-
|
|
|
|
r = amdgpu_vm_clear_freed(adev, vm, NULL);
|
|
r = amdgpu_vm_clear_freed(adev, vm, NULL);
|
|
if (r)
|
|
if (r)
|
|
goto error;
|
|
goto error;
|
|
@@ -530,6 +526,10 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
|
|
operation == AMDGPU_VA_OP_REPLACE)
|
|
operation == AMDGPU_VA_OP_REPLACE)
|
|
r = amdgpu_vm_bo_update(adev, bo_va, false);
|
|
r = amdgpu_vm_bo_update(adev, bo_va, false);
|
|
|
|
|
|
|
|
+ r = amdgpu_vm_update_directories(adev, vm);
|
|
|
|
+ if (r)
|
|
|
|
+ goto error;
|
|
|
|
+
|
|
error:
|
|
error:
|
|
if (r && r != -ERESTARTSYS)
|
|
if (r && r != -ERESTARTSYS)
|
|
DRM_ERROR("Couldn't update BO_VA (%d)\n", r);
|
|
DRM_ERROR("Couldn't update BO_VA (%d)\n", r);
|