diff mbox series

[5/5] drm/ttm: drop ttm_bo_move_ttm wrapper

Message ID 20201019071314.1671485-6-airlied@gmail.com
State New, archived
Headers show
Series ttm get rid of ttm_bo_move_ttm | expand

Commit Message

Dave Airlie Oct. 19, 2020, 7:13 a.m. UTC
From: Dave Airlie <airlied@redhat.com>

The apis to move old/new are in place everywhere so this is no
longer needed.
---
 drivers/gpu/drm/ttm/ttm_bo_util.c | 20 --------------------
 include/drm/ttm/ttm_bo_driver.h   | 22 ----------------------
 2 files changed, 42 deletions(-)

Comments

Christian König Oct. 19, 2020, 10 a.m. UTC | #1
Am 19.10.20 um 09:13 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> 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>

> ---
>   drivers/gpu/drm/ttm/ttm_bo_util.c | 20 --------------------
>   include/drm/ttm/ttm_bo_driver.h   | 22 ----------------------
>   2 files changed, 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index 1c1055a500cd..a3132e8a4102 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -89,26 +89,6 @@ int ttm_bo_move_old_to_system(struct ttm_buffer_object *bo,
>   }
>   EXPORT_SYMBOL(ttm_bo_move_old_to_system);
>   
> -int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
> -		   struct ttm_operation_ctx *ctx,
> -		    struct ttm_resource *new_mem)
> -{
> -	struct ttm_resource *old_mem = &bo->mem;
> -	int ret;
> -
> -	ret = ttm_bo_move_old_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 4b341914858b..2fbd9adc1645 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,
diff mbox series

Patch

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 1c1055a500cd..a3132e8a4102 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -89,26 +89,6 @@  int ttm_bo_move_old_to_system(struct ttm_buffer_object *bo,
 }
 EXPORT_SYMBOL(ttm_bo_move_old_to_system);
 
-int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
-		   struct ttm_operation_ctx *ctx,
-		    struct ttm_resource *new_mem)
-{
-	struct ttm_resource *old_mem = &bo->mem;
-	int ret;
-
-	ret = ttm_bo_move_old_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 4b341914858b..2fbd9adc1645 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,