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

Commit 74561cd4 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: remove no_gpu_wait param from ttm_bo_move_accel_cleanup 



It isn't used and not waiting for the GPU after scheduling a move is
actually quite dangerous.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 99c44632

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −2
Original line number Diff line number Diff line
@@ -287,8 +287,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo, 
			       new_mem->num_pages * PAGE_SIZE, /* bytes */

			       bo->resv, &fence);

	/* FIXME: handle copy error */

	r = ttm_bo_move_accel_cleanup(bo, fence,

				      evict, no_wait_gpu, new_mem);

	r = ttm_bo_move_accel_cleanup(bo, fence, evict, new_mem);

	fence_put(fence);

	return r;

}

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,6 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr, 
				ret = ttm_bo_move_accel_cleanup(bo,

								&fence->base,

								evict,

								no_wait_gpu,

								new_mem);

				nouveau_fence_unref(&fence);

			}

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −2
Original line number Diff line number Diff line
@@ -300,8 +300,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, 
	if (IS_ERR(fence))

		return PTR_ERR(fence);



	r = ttm_bo_move_accel_cleanup(bo, &fence->base,

				      evict, no_wait_gpu, new_mem);

	r = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, 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
@@ -637,7 +637,6 @@ EXPORT_SYMBOL(ttm_bo_kunmap); 
int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,

			      struct fence *fence,

			      bool evict,

			      bool no_wait_gpu,

			      struct ttm_mem_reg *new_mem)

{

	struct ttm_bo_device *bdev = bo->bdev;

include/drm/ttm/ttm_bo_driver.h

+1 −3
Original line number Diff line number Diff line
@@ -1004,7 +1004,6 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo); 
 * @bo: A pointer to a struct ttm_buffer_object.

 * @fence: A fence object that signals when moving is complete.

 * @evict: This is an evict move. Don't return until the buffer is idle.

 * @no_wait_gpu: Return immediately if the GPU is busy.

 * @new_mem: struct ttm_mem_reg indicating where to move.

 *

 * Accelerated move function to be called when an accelerated move
@@ -1016,8 +1015,7 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo); 
 */



extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,

				     struct fence *fence,

				     bool evict, bool no_wait_gpu,

				     struct fence *fence, bool evict,

				     struct ttm_mem_reg *new_mem);

/**

 * ttm_io_prot