drm/ttm: add move old to system to drivers.

Uninline ttm_bo_move_ttm. Eventually want to unhook the unbind out.

Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201019071314.1671485-5-airlied@gmail.com

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index f8c9d66d3ef7b72097bb13305c55afb254843d7e..00bec9924b5bbd3091b41e24ae3abd3a5f4e0f6e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -562,7 +562,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
        }
 
        /* move BO (in tmp_mem) to new_mem */
-       r = ttm_bo_move_ttm(bo, ctx, new_mem);
+       r = ttm_bo_move_to_system(bo, ctx);
+       if (unlikely(r))
+               goto out_cleanup;
+
+       ttm_bo_assign_mem(bo, new_mem);
 out_cleanup:
        ttm_resource_free(bo, &tmp_mem);
        return r;
@@ -672,8 +676,13 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,
        }
 
        if (old_mem->mem_type == TTM_PL_TT &&
-           new_mem->mem_type == TTM_PL_SYSTEM)
-               return ttm_bo_move_ttm(bo, ctx, new_mem);
+           new_mem->mem_type == TTM_PL_SYSTEM) {
+               r = ttm_bo_move_to_system(bo, ctx);
+               if (r)
+                       return r;
+               ttm_bo_assign_mem(bo, new_mem);
+               return 0;
+       }
 
        if (old_mem->mem_type == AMDGPU_PL_GDS ||
            old_mem->mem_type == AMDGPU_PL_GWS ||

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 63baa9367851e0fb36ebc53643e90d47661196dc..ec79c3b251e833420fd1a3d555147a1254dbea87 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -897,7 +897,11 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict,
        if (ret)
                goto out;
 
-       ret = ttm_bo_move_ttm(bo, ctx, new_reg);
+       ret = ttm_bo_move_to_system(bo, ctx);
+       if (ret)
+               goto out;
+
+       ttm_bo_assign_mem(bo, &tmp_reg);
 out:
        ttm_resource_free(bo, &tmp_reg);
        return ret;
@@ -1048,7 +1052,10 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
 
        if (old_reg->mem_type == TTM_PL_TT &&
            new_reg->mem_type == TTM_PL_SYSTEM) {
-               ret = ttm_bo_move_ttm(bo, ctx, new_reg);
+               ret = ttm_bo_move_to_system(bo, ctx);
+               if (ret)
+                       return ret;
+               ttm_bo_assign_mem(bo, new_reg);
                goto out;
        }
 

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 9437d29248fd32d3827ba0544a30d9b144a36606..426643120e3a6cfc86aef11c0cd2d5f7beac4506 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -244,7 +244,11 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
        if (unlikely(r)) {
                goto out_cleanup;
        }
-       r = ttm_bo_move_ttm(bo, ctx, new_mem);
+       r = ttm_bo_move_to_system(bo, ctx);
+       if (unlikely(r))
+               goto out_cleanup;
+
+       ttm_bo_assign_mem(bo, new_mem);
 out_cleanup:
        ttm_resource_free(bo, &tmp_mem);
        return r;
@@ -319,9 +323,14 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
        }
 
        if (old_mem->mem_type == TTM_PL_TT &&
-           new_mem->mem_type == TTM_PL_SYSTEM)
-               return ttm_bo_move_ttm(bo, ctx, new_mem);
+           new_mem->mem_type == TTM_PL_SYSTEM) {
+               r = ttm_bo_move_to_system(bo, ctx);
+               if (r)
+                       return r;
 
+               ttm_bo_assign_mem(bo, new_mem);
+               return 0;
+       }
        if (!rdev->ring[radeon_copy_ring_index(rdev)].ready ||
            rdev->asic->copy.copy == NULL) {
                /* use memcpy */

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 7ea0482c1aeeb37f42e8c57a6ed5235dae1ec665..4a74a297e5299de428e000ca78920c3c3c29e370 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -66,8 +66,8 @@ int ttm_bo_move_to_new_tt_mem(struct ttm_buffer_object *bo,
 }
 EXPORT_SYMBOL(ttm_bo_move_to_new_tt_mem);
 
-static int ttm_bo_move_to_system(struct ttm_buffer_object *bo,
-                                struct ttm_operation_ctx *ctx)
+int ttm_bo_move_to_system(struct ttm_buffer_object *bo,
+                         struct ttm_operation_ctx *ctx)
 {
        struct ttm_resource *old_mem = &bo->mem;
        int ret;
@@ -87,6 +87,7 @@ static int ttm_bo_move_to_system(struct ttm_buffer_object *bo,
        old_mem->mem_type = TTM_PL_SYSTEM;
        return 0;
 }
+EXPORT_SYMBOL(ttm_bo_move_to_system);
 
 int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
                   struct ttm_operation_ctx *ctx,

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index 112253246f0822628d1786a4f8ba693256950056..c5cf81c0997167b9d668c04757adac646a893d14 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -735,13 +735,18 @@ static int vmw_move(struct ttm_buffer_object *bo,
 {
        struct ttm_resource_manager *old_man = ttm_manager_type(bo->bdev, bo->mem.mem_type);
        struct ttm_resource_manager *new_man = ttm_manager_type(bo->bdev, new_mem->mem_type);
+       int ret;
 
        if (old_man->use_tt && new_man->use_tt) {
                if (bo->mem.mem_type == TTM_PL_SYSTEM) {
                        ttm_bo_assign_mem(bo, new_mem);
                        return 0;
                }
-               return ttm_bo_move_ttm(bo, ctx, new_mem);
+               ret = ttm_bo_move_to_system(bo, ctx);
+               if (ret)
+                       return ret;
+               ttm_bo_assign_mem(bo, new_mem);
+               return 0;
        } else {
                return ttm_bo_move_memcpy(bo, ctx, new_mem);
        }

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 1f4d2b1febd0db06ffc98d448cdb4b193973879e..9e60e6814ba1b86ec5199a5ff9546d7d3af5f4ac 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -596,6 +596,8 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
 int ttm_bo_move_to_new_tt_mem(struct ttm_buffer_object *bo,
                              struct ttm_operation_ctx *ctx,
                              struct ttm_resource *new_mem);
+int ttm_bo_move_to_system(struct ttm_buffer_object *bo,
+                         struct ttm_operation_ctx *ctx);
 
 /**
  * ttm_bo_move_memcpy