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

Commit 8aa6d4fc authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: remove lazy parameter from ttm_bo_wait 



Not used any more.

Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dfd5e50e

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
	}



	/* Fallback to software copy. */

	ret = ttm_bo_wait(bo, true, intr, no_wait_gpu);

	ret = ttm_bo_wait(bo, intr, no_wait_gpu);

	if (ret == 0)

		ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);

drivers/gpu/drm/nouveau/nouveau_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ nouveau_gem_object_unmap(struct nouveau_bo *nvbo, struct nvkm_vma *vma) 
	list_del(&vma->head);



	if (fobj && fobj->shared_count > 1)

		ttm_bo_wait(&nvbo->bo, true, false, false);

		ttm_bo_wait(&nvbo->bo, false, false);

	else if (fobj && fobj->shared_count == 1)

		fence = rcu_dereference_protected(fobj->shared[0],

						reservation_object_held(resv));
@@ -651,7 +651,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, 
				data |= r->vor;

		}



		ret = ttm_bo_wait(&nvbo->bo, true, false, false);

		ret = ttm_bo_wait(&nvbo->bo, false, false);

		if (ret) {

			NV_PRINTK(err, cli, "reloc wait_idle failed: %d\n", ret);

			break;

drivers/gpu/drm/qxl/qxl_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal 
	if (stall)

		mutex_unlock(&qdev->surf_evict_mutex);



	ret = ttm_bo_wait(&surf->tbo, true, true, !stall);

	ret = ttm_bo_wait(&surf->tbo, true, !stall);



	if (stall)

		mutex_lock(&qdev->surf_evict_mutex);

drivers/gpu/drm/qxl/qxl_object.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, 
	if (mem_type)

		*mem_type = bo->tbo.mem.mem_type;



	r = ttm_bo_wait(&bo->tbo, true, true, no_wait);

	r = ttm_bo_wait(&bo->tbo, true, no_wait);

	ttm_bo_unreserve(&bo->tbo);

	return r;

}

drivers/gpu/drm/radeon/radeon_object.c

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait) 
	if (mem_type)

		*mem_type = bo->tbo.mem.mem_type;



	r = ttm_bo_wait(&bo->tbo, true, true, no_wait);

	r = ttm_bo_wait(&bo->tbo, true, no_wait);

	ttm_bo_unreserve(&bo->tbo);

	return r;

}