drm/amdgpu: stop pipelining VM PDs/PTs moves

We are going to need this for recoverable page fault handling and it
makes shadow handling during GPU reset much more easier.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index c1387efc0c91..9436994bc406 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1366,7 +1366,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
 {
         WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);
         WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&
-                     !bo->pin_count);
+                     !bo->pin_count && bo->tbo.type != ttm_bo_type_kernel);
         WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);
         WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_VRAM &&
                      !(bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS));
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 5da87ec67c64..d61910873627 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -532,7 +532,11 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
         if (r)
                 goto error;
 
-        r = ttm_bo_pipeline_move(bo, fence, evict, new_mem);
+        /* Always block for VM page tables before committing the new location */
+        if (bo->type == ttm_bo_type_kernel)
+                r = ttm_bo_move_accel_cleanup(bo, fence, true, new_mem);
+        else
+                r = ttm_bo_pipeline_move(bo, fence, evict, new_mem);
         dma_fence_put(fence);
         return r;