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

drm/radeon: let bo_reserve take no_intr instead of no_wait param 



The no_wait param isn't used anywhere, and actually isn't
very usefull at all.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
parent 421ca7ab

drivers/gpu/drm/radeon/radeon_object.c

+3 −4
Original line number Diff line number Diff line
@@ -627,18 +627,17 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait) 
/**

 * radeon_bo_reserve - reserve bo

 * @bo:		bo structure

 * @no_wait:		don't sleep while trying to reserve (return -EBUSY)

 * @no_intr:	don't return -ERESTARTSYS on pending signal

 *

 * Returns:

 * -EBUSY: buffer is busy and @no_wait is true

 * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by

 * a signal. Release all buffer reservations and return to user-space.

 */

int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait)

int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr)

{

	int r;



	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);

	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, 0);

	if (unlikely(r != 0)) {

		if (r != -ERESTARTSYS)

			dev_err(bo->rdev->dev, "%p reserve failed\n", bo);

drivers/gpu/drm/radeon/radeon_object.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline unsigned radeon_mem_type_to_domain(u32 mem_type) 
	return 0;

}



int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait);

int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr);



static inline void radeon_bo_unreserve(struct radeon_bo *bo)

{