drm/ttm: remove sync_obj_arg from ttm_bo_move_accel_cleanup

PATCH In review Maarten Lankhorst 1 participant 1 message Oct 12, 2012

Subsystems (5)

DRM drivers DRM misc Radeon and amdgpu DRM drivers nouveau +1 more subsystems

lore

Share & tools

lore

Maarten Lankhorst

author

2012-10-12 15:03 UTC #0 lore raw

PATCH 3/4 drm/ttm: remove sync_obj_arg from ttm_bo_move_accel_cleanup

Signed-off-by Maarten Lankhorst <[email protected]>

---
 drivers/gpu/drm/nouveau/nouveau_bo.c |    2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c  |    2 +-
 drivers/gpu/drm/ttm/ttm_bo_util.c    |    1 -
 include/drm/ttm/ttm_bo_driver.h      |    3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1

index 259e5f1..bff6a18 100644
@@ -564,7 +564,7 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
 	if (ret)
 		return ret;
 
-	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict,
+	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, evict,
 					no_wait_reserve, no_wait_gpu, new_mem);
 	nouveau_fence_unref(&fence);
 	return ret;

drivers/gpu/drm/radeon/radeon_ttm.c +1 -1

index 5ebe1b3..929be87 100644
@@ -265,7 +265,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
 			new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */
 			&fence);
 	/* FIXME: handle copy error */
-	r = ttm_bo_move_accel_cleanup(bo, (void *)fence, NULL,
+	r = ttm_bo_move_accel_cleanup(bo, (void *)fence,
 				      evict, no_wait_reserve, no_wait_gpu, new_mem);
 	radeon_fence_unref(&fence);
 	return r;

drivers/gpu/drm/ttm/ttm_bo_util.c +0 -1

index 2fb810c..d80d1e8 100644
@@ -610,7 +610,6 @@ EXPORT_SYMBOL(ttm_bo_kunmap);
 
 int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
 			      void *sync_obj,
-			      void *sync_obj_arg,
 			      bool evict, bool no_wait_reserve,
 			      bool no_wait_gpu,
 			      struct ttm_mem_reg *new_mem)

include/drm/ttm/ttm_bo_driver.h +0 -3

index 3e193f5..c90c051 100644
@@ -959,8 +959,6 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
  *
  * @bo: A pointer to a struct ttm_buffer_object.
  * @sync_obj: A sync object that signals when moving is complete.
- * @sync_obj_arg: An argument to pass to the sync object idle / wait
- * functions.
  * @evict: This is an evict move. Don't return until the buffer is idle.
  * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.

@@ -976,7 +974,6 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
 
 extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
 				     void *sync_obj,
-				     void *sync_obj_arg,
 				     bool evict, bool no_wait_reserve,
 				     bool no_wait_gpu,
 				     struct ttm_mem_reg *new_mem);