drm/ttm: use an operation context for ttm_bo_mem_space v2

Instead of specifying interruptible and no_wait_gpu manually.

v2: rebase

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 07ecf721ebf9..48b24155462c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -471,6 +471,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,
                                 bool no_wait_gpu,
                                 struct ttm_mem_reg *new_mem)
 {
+        struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };
         struct amdgpu_device *adev;
         struct ttm_mem_reg *old_mem = &bo->mem;
         struct ttm_mem_reg tmp_mem;
@@ -488,8 +489,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,
         placements.fpfn = 0;
         placements.lpfn = 0;
         placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
-        r = ttm_bo_mem_space(bo, &placement, &tmp_mem,
-                             interruptible, no_wait_gpu);
+        r = ttm_bo_mem_space(bo, &placement, &tmp_mem, &ctx);
         if (unlikely(r)) {
                 return r;
         }
@@ -518,6 +518,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,
                                 bool no_wait_gpu,
                                 struct ttm_mem_reg *new_mem)
 {
+        struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };
         struct amdgpu_device *adev;
         struct ttm_mem_reg *old_mem = &bo->mem;
         struct ttm_mem_reg tmp_mem;
@@ -535,8 +536,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,
         placements.fpfn = 0;
         placements.lpfn = 0;
         placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
-        r = ttm_bo_mem_space(bo, &placement, &tmp_mem,
-                             interruptible, no_wait_gpu);
+        r = ttm_bo_mem_space(bo, &placement, &tmp_mem, &ctx);
         if (unlikely(r)) {
                 return r;
         }
@@ -878,6 +878,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo)
 {
         struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
+        struct ttm_operation_ctx ctx = { false, false };
         struct amdgpu_ttm_tt *gtt = (void*)bo->ttm;
         struct ttm_mem_reg tmp;
         struct ttm_placement placement;
@@ -900,7 +901,7 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo)
         placements.flags = (bo->mem.placement & ~TTM_PL_MASK_MEM) |
                 TTM_PL_FLAG_TT;
 
-        r = ttm_bo_mem_space(bo, &placement, &tmp, false, false);
+        r = ttm_bo_mem_space(bo, &placement, &tmp, &ctx);
         if (unlikely(r))
                 return r;