diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-19 17:13:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-20 05:04:19 +1000 |
| commit | 23fae9cf97cc0ba54e4d6c8e078871f56370f271 (patch) | |
| tree | 94e81eb48c30db325aa4798f5ddb507f26ac3763 | |
| parent | c37d951cb42aa340513c0bc2df10b7324fa0d856 (diff) | |
drm/ttm: drop ttm_bo_move_ttm wrapper
The apis to move old/new are in place everywhere so this is no
longer needed.
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-6-airlied@gmail.com
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 19 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 22 |
2 files changed, 0 insertions, 41 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 4a74a297e529..558e78ad82aa 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -89,25 +89,6 @@ int ttm_bo_move_to_system(struct ttm_buffer_object *bo, } EXPORT_SYMBOL(ttm_bo_move_to_system); -int ttm_bo_move_ttm(struct ttm_buffer_object *bo, - struct ttm_operation_ctx *ctx, - struct ttm_resource *new_mem) -{ - int ret; - - ret = ttm_bo_move_to_system(bo, ctx); - if (unlikely(ret != 0)) - return ret; - - ret = ttm_bo_move_to_new_tt_mem(bo, ctx, new_mem); - if (unlikely(ret != 0)) - return ret; - - ttm_bo_assign_mem(bo, new_mem); - return 0; -} -EXPORT_SYMBOL(ttm_bo_move_ttm); - int ttm_mem_io_reserve(struct ttm_bo_device *bdev, struct ttm_resource *mem) { diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 9e60e6814ba1..a89728cb9a23 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -566,32 +566,10 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo) /* * ttm_bo_util.c */ - int ttm_mem_io_reserve(struct ttm_bo_device *bdev, struct ttm_resource *mem); void ttm_mem_io_free(struct ttm_bo_device *bdev, struct ttm_resource *mem); -/** - * ttm_bo_move_ttm - * - * @bo: A pointer to a struct ttm_buffer_object. - * @interruptible: Sleep interruptible if waiting. - * @no_wait_gpu: Return immediately if the GPU is busy. - * @new_mem: struct ttm_resource indicating where to move. - * - * Optimized move function for a buffer object with both old and - * new placement backed by a TTM. The function will, if successful, - * free any old aperture space, and set (@new_mem)->mm_node to NULL, - * and update the (@bo)->mem placement flags. If unsuccessful, the old - * data remains untouched, and it's up to the caller to free the - * memory space indicated by @new_mem. - * Returns: - * !0: Failure. - */ - -int ttm_bo_move_ttm(struct ttm_buffer_object *bo, - struct ttm_operation_ctx *ctx, - struct ttm_resource *new_mem); int ttm_bo_move_to_new_tt_mem(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, |