Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b03640b1 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Dave Airlie
Browse files

drm/ttm: remove sync_obj_arg from ttm_bo_move_accel_cleanup 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-By: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5fb4ef0e

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -611,7 +611,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
Original line number Diff line number Diff line
@@ -970,8 +970,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.
@@ -987,7 +985,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);