Re: [PATCH] drm/ttm: remove unused paramter

2024-03-29 Thread Christian König

Am 29.03.24 um 12:10 schrieb Christian König:

Am 25.03.24 um 08:45 schrieb Jesse Zhang:

remove the unsed the paramter in the function
ttm_bo_bounce_temp_buffer and ttm_bo_add_move_fence.

Signed-off-by: Jesse Zhang 


Good catch, Reviewed-by: Christian König 


Please rebase that patch on top of drm-misc-next.

Regards,
Christian.



Regards,
Christian.


---
  drivers/gpu/drm/ttm/ttm_bo.c | 10 --
  1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index edf10618fe2b..7f08787687a7 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -402,7 +402,6 @@ void ttm_bo_put(struct ttm_buffer_object *bo)
  EXPORT_SYMBOL(ttm_bo_put);
    static int ttm_bo_bounce_temp_buffer(struct ttm_buffer_object *bo,
- struct ttm_resource **mem,
   struct ttm_operation_ctx *ctx,
   struct ttm_place *hop)
  {
@@ -470,7 +469,7 @@ static int ttm_bo_evict(struct ttm_buffer_object 
*bo,

  if (ret != -EMULTIHOP)
  break;
  -    ret = ttm_bo_bounce_temp_buffer(bo, _mem, ctx, );
+    ret = ttm_bo_bounce_temp_buffer(bo, ctx, );
  } while (!ret);
    if (ret) {
@@ -699,7 +698,6 @@ EXPORT_SYMBOL(ttm_bo_unpin);
   */
  static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
   struct ttm_resource_manager *man,
- struct ttm_resource *mem,
   bool no_wait_gpu)
  {
  struct dma_fence *fence;
@@ -753,7 +751,7 @@ static int ttm_bo_mem_force_space(struct 
ttm_buffer_object *bo,

  return ret;
  } while (1);
  -    return ttm_bo_add_move_fence(bo, man, *mem, ctx->no_wait_gpu);
+    return ttm_bo_add_move_fence(bo, man, ctx->no_wait_gpu);
  }
    /**
@@ -802,7 +800,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
  if (unlikely(ret))
  goto error;
  -    ret = ttm_bo_add_move_fence(bo, man, *mem, ctx->no_wait_gpu);
+    ret = ttm_bo_add_move_fence(bo, man, ctx->no_wait_gpu);
  if (unlikely(ret)) {
  ttm_resource_free(bo, mem);
  if (ret == -EBUSY)
@@ -866,7 +864,7 @@ static int ttm_bo_move_buffer(struct 
ttm_buffer_object *bo,

  bounce:
  ret = ttm_bo_handle_move_mem(bo, mem, false, ctx, );
  if (ret == -EMULTIHOP) {
-    ret = ttm_bo_bounce_temp_buffer(bo, , ctx, );
+    ret = ttm_bo_bounce_temp_buffer(bo, ctx, );
  if (ret)
  goto out;
  /* try and move to final place now. */






Re: [PATCH] drm/ttm: remove unused paramter

2024-03-29 Thread Christian König

Am 25.03.24 um 08:45 schrieb Jesse Zhang:

remove the unsed the paramter in the function
ttm_bo_bounce_temp_buffer and ttm_bo_add_move_fence.

Signed-off-by: Jesse Zhang 


Good catch, Reviewed-by: Christian König 

Regards,
Christian.


---
  drivers/gpu/drm/ttm/ttm_bo.c | 10 --
  1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index edf10618fe2b..7f08787687a7 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -402,7 +402,6 @@ void ttm_bo_put(struct ttm_buffer_object *bo)
  EXPORT_SYMBOL(ttm_bo_put);
  
  static int ttm_bo_bounce_temp_buffer(struct ttm_buffer_object *bo,

-struct ttm_resource **mem,
 struct ttm_operation_ctx *ctx,
 struct ttm_place *hop)
  {
@@ -470,7 +469,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo,
if (ret != -EMULTIHOP)
break;
  
-		ret = ttm_bo_bounce_temp_buffer(bo, _mem, ctx, );

+   ret = ttm_bo_bounce_temp_buffer(bo, ctx, );
} while (!ret);
  
  	if (ret) {

@@ -699,7 +698,6 @@ EXPORT_SYMBOL(ttm_bo_unpin);
   */
  static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
 struct ttm_resource_manager *man,
-struct ttm_resource *mem,
 bool no_wait_gpu)
  {
struct dma_fence *fence;
@@ -753,7 +751,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object 
*bo,
return ret;
} while (1);
  
-	return ttm_bo_add_move_fence(bo, man, *mem, ctx->no_wait_gpu);

+   return ttm_bo_add_move_fence(bo, man, ctx->no_wait_gpu);
  }
  
  /**

@@ -802,7 +800,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
if (unlikely(ret))
goto error;
  
-		ret = ttm_bo_add_move_fence(bo, man, *mem, ctx->no_wait_gpu);

+   ret = ttm_bo_add_move_fence(bo, man, ctx->no_wait_gpu);
if (unlikely(ret)) {
ttm_resource_free(bo, mem);
if (ret == -EBUSY)
@@ -866,7 +864,7 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
  bounce:
ret = ttm_bo_handle_move_mem(bo, mem, false, ctx, );
if (ret == -EMULTIHOP) {
-   ret = ttm_bo_bounce_temp_buffer(bo, , ctx, );
+   ret = ttm_bo_bounce_temp_buffer(bo, ctx, );
if (ret)
goto out;
/* try and move to final place now. */