drm/amdgpu: use amdgpu_gem_va_check() in amdgpu_gem_va_update_vm()

This removes code duplication.

Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index ec7037a48b6ebe5e3ffd8dae7894322c1e4855a2..51d759463384602ef0c3ca90b9667b6de6e0a865 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -504,13 +504,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
        list_for_each_entry(entry, list, head) {
                struct amdgpu_bo *bo =
                        container_of(entry->bo, struct amdgpu_bo, tbo);
-
-               /* if anything is swapped out don't swap it in here,
-                  just abort and wait for the next CS */
-               if (!amdgpu_bo_gpu_accessible(bo))
-                       goto error;
-
-               if (bo->shadow && !amdgpu_bo_gpu_accessible(bo->shadow))
+               if (amdgpu_gem_va_check(NULL, bo))
                        goto error;
        }