Commit 28ee846e authored by Dave Airlie's avatar Dave Airlie

drm/ttm: remove move to new and inline into remainging place.

This show the remaining bind callback, which my next series of
patches will aim to remove.
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020010319.1692445-6-airlied@gmail.com
parent f227ccc9
...@@ -252,9 +252,15 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, ...@@ -252,9 +252,15 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
if (ret) if (ret)
goto out_err; goto out_err;
ret = ttm_bo_move_to_new_tt_mem(bo, ctx, mem); if (mem->mem_type != TTM_PL_SYSTEM) {
if (ret) ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
goto out_err; if (ret)
goto out_err;
ret = bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem);
if (ret)
goto out_err;
}
} }
if (bdev->driver->move_notify) if (bdev->driver->move_notify)
...@@ -1492,7 +1498,3 @@ void ttm_bo_tt_destroy(struct ttm_buffer_object *bo) ...@@ -1492,7 +1498,3 @@ void ttm_bo_tt_destroy(struct ttm_buffer_object *bo)
bo->ttm = NULL; bo->ttm = NULL;
} }
int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem)
{
return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem);
}
...@@ -45,26 +45,6 @@ struct ttm_transfer_obj { ...@@ -45,26 +45,6 @@ struct ttm_transfer_obj {
struct ttm_buffer_object *bo; 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 ret;
if (new_mem->mem_type == TTM_PL_SYSTEM)
return 0;
ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
if (unlikely(ret != 0))
return ret;
ret = ttm_bo_tt_bind(bo, new_mem);
if (unlikely(ret != 0))
return ret;
return 0;
}
int ttm_mem_io_reserve(struct ttm_bo_device *bdev, int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
struct ttm_resource *mem) struct ttm_resource *mem)
{ {
......
...@@ -560,10 +560,6 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev, ...@@ -560,10 +560,6 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
void ttm_mem_io_free(struct ttm_bo_device *bdev, void ttm_mem_io_free(struct ttm_bo_device *bdev,
struct ttm_resource *mem); struct ttm_resource *mem);
int ttm_bo_move_to_new_tt_mem(struct ttm_buffer_object *bo,
struct ttm_operation_ctx *ctx,
struct ttm_resource *new_mem);
/** /**
* ttm_bo_move_memcpy * ttm_bo_move_memcpy
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment