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

Commit 17d33bc9 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: drop waiting for idle in ttm_bo_evict. 



That is unnecessary now.

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 a6f76dcd

drivers/gpu/drm/ttm/ttm_bo.c

+1 −10
Original line number Diff line number Diff line
@@ -684,15 +684,6 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, 
	struct ttm_placement placement;

	int ret = 0;



	ret = ttm_bo_wait(bo, interruptible, no_wait_gpu);



	if (unlikely(ret != 0)) {

		if (ret != -ERESTARTSYS) {

			pr_err("Failed to expire sync object before buffer eviction\n");

		}

		goto out;

	}



	lockdep_assert_held(&bo->resv->lock.base);



	evict_mem = bo->mem;
@@ -716,7 +707,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, 


	ret = ttm_bo_handle_move_mem(bo, &evict_mem, true, interruptible,

				     no_wait_gpu);

	if (ret) {

	if (unlikely(ret)) {

		if (ret != -ERESTARTSYS)

			pr_err("Buffer eviction failed\n");

		ttm_bo_mem_put(bo, &evict_mem);