3 files changed, 30 insertions, 19 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 9e05e257729f..0d15eb7d31d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem)
  *
  * Allocate the address space for a node.
  */
-int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,
-                         struct ttm_buffer_object *tbo,
-                         const struct ttm_place *place,
-                         struct ttm_mem_reg *mem)
+static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,
+                                struct ttm_buffer_object *tbo,
+                                const struct ttm_place *place,
+                                struct ttm_mem_reg *mem)
 {
         struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
         struct amdgpu_gtt_mgr *mgr = man->priv;
@@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,
                                         fpfn, lpfn, mode);
         spin_unlock(&mgr->lock);
 
-        if (!r) {
+        if (!r)
                 mem->start = node->start;
-                if (&tbo->mem == mem)
-                        tbo->offset = (tbo->mem.start << PAGE_SHIFT) +
-                            tbo->bdev->man[tbo->mem.mem_type].gpu_offset;
-        }
 
         return r;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 8b2c294f6f79..1efe1cba7e11 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -824,20 +824,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
 
 int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
 {
+        struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
         struct ttm_tt *ttm = bo->ttm;
+        struct ttm_mem_reg tmp;
+
+        struct ttm_placement placement;
+        struct ttm_place placements;
         int r;
 
         if (!ttm || amdgpu_ttm_is_bound(ttm))
                 return 0;
 
-        r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo,
-                                 NULL, bo_mem);
-        if (r) {
-                DRM_ERROR("Failed to allocate GTT address space (%d)\n", r);
+        tmp = bo->mem;
+        tmp.mm_node = NULL;
+        placement.num_placement = 1;
+        placement.placement = &placements;
+        placement.num_busy_placement = 1;
+        placement.busy_placement = &placements;
+        placements.fpfn = 0;
+        placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT;
+        placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
+
+        r = ttm_bo_mem_space(bo, &placement, &tmp, true, false);
+        if (unlikely(r))
                 return r;
-        }
 
-        return amdgpu_ttm_do_bind(ttm, bo_mem);
+        r = ttm_bo_move_ttm(bo, true, false, &tmp);
+        if (unlikely(r))
+                ttm_bo_mem_put(bo, &tmp);
+        else
+                bo->offset = (bo->mem.start << PAGE_SHIFT) +
+                        bo->bdev->man[bo->mem.mem_type].gpu_offset;
+
+        return r;
 }
 
 int amdgpu_ttm_recover_gart(struct amdgpu_device *adev)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index f22a4758719d..43093bffa2cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
 extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
 
 bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem);
-int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,
-                         struct ttm_buffer_object *tbo,
-                         const struct ttm_place *place,
-                         struct ttm_mem_reg *mem);
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
 
 uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man);