OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
Christian König 2012-09-11 16:10:01 +02:00 committed by Alex Deucher
parent 421ca7ab86
commit d63dfed5e9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/radeon/radeon_object.c
View File

@ -627,18 +627,17 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait)
/** /**
* radeon_bo_reserve - reserve bo * radeon_bo_reserve - reserve bo
* @bo: bo structure * @bo: bo structure
* @no_wait: don't sleep while trying to reserve (return -EBUSY) * @no_intr: don't return -ERESTARTSYS on pending signal
* *
* Returns: * Returns:
* -EBUSY: buffer is busy and @no_wait is true
* -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
* a signal. Release all buffer reservations and return to user-space. * 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; 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 (unlikely(r != 0)) {
if (r != -ERESTARTSYS) if (r != -ERESTARTSYS)
dev_err(bo->rdev->dev, "%p reserve failed\n", bo); dev_err(bo->rdev->dev, "%p reserve failed\n", bo);

2
drivers/gpu/drm/radeon/radeon_object.h
View File

@ -52,7 +52,7 @@ static inline unsigned radeon_mem_type_to_domain(u32 mem_type)
return 0; 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) static inline void radeon_bo_unreserve(struct radeon_bo *bo)
{ {