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

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

drm/radeon: inline reservations 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 06597ce8

drivers/gpu/drm/radeon/radeon_object.c

+0 −23
Original line number Diff line number Diff line
@@ -619,26 +619,3 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait) 
	ttm_bo_unreserve(&bo->tbo);

	return r;

}
 




/**

 * radeon_bo_reserve - reserve bo

 * @bo:		bo structure

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

 *

 * Returns:

 * -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_intr)

{

	int r;



	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);

		return r;

	}

	return 0;

}

drivers/gpu/drm/radeon/radeon_object.h

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

}



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

/**

 * radeon_bo_reserve - reserve bo

 * @bo:		bo structure

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

 *

 * Returns:

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

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

 */

static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr)

{

	int r;



	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);

		return r;

	}

	return 0;

}



static inline void radeon_bo_unreserve(struct radeon_bo *bo)

{