diff options
author | Christian König <deathsimple@vodafone.de> | 2012-09-11 10:10:01 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2012-09-20 13:10:42 -0400 |
commit | d63dfed5e9aa5fbea25a471300ee1b33bdc710d0 (patch) | |
tree | 7286854cadd7e029de7606f83432f2272725e1e7 /drivers | |
parent | 421ca7ab86aef01b4e22fb171d3d6bad6f1a5b96 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 7 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 2844e0b204b0..8d23b7e2ae3d 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
@@ -627,18 +627,17 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait) | |||
627 | /** | 627 | /** |
628 | * radeon_bo_reserve - reserve bo | 628 | * radeon_bo_reserve - reserve bo |
629 | * @bo: bo structure | 629 | * @bo: bo structure |
630 | * @no_wait: don't sleep while trying to reserve (return -EBUSY) | 630 | * @no_intr: don't return -ERESTARTSYS on pending signal |
631 | * | 631 | * |
632 | * Returns: | 632 | * Returns: |
633 | * -EBUSY: buffer is busy and @no_wait is true | ||
634 | * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by | 633 | * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by |
635 | * a signal. Release all buffer reservations and return to user-space. | 634 | * a signal. Release all buffer reservations and return to user-space. |
636 | */ | 635 | */ |
637 | int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait) | 636 | int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr) |
638 | { | 637 | { |
639 | int r; | 638 | int r; |
640 | 639 | ||
641 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); | 640 | r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, 0); |
642 | if (unlikely(r != 0)) { | 641 | if (unlikely(r != 0)) { |
643 | if (r != -ERESTARTSYS) | 642 | if (r != -ERESTARTSYS) |
644 | dev_err(bo->rdev->dev, "%p reserve failed\n", bo); | 643 | dev_err(bo->rdev->dev, "%p reserve failed\n", bo); |
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h index 2aaf6e305e42..93cd491fff2e 100644 --- a/drivers/gpu/drm/radeon/radeon_object.h +++ b/drivers/gpu/drm/radeon/radeon_object.h | |||
@@ -52,7 +52,7 @@ static inline unsigned radeon_mem_type_to_domain(u32 mem_type) | |||
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait); | 55 | int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr); |
56 | 56 | ||
57 | static inline void radeon_bo_unreserve(struct radeon_bo *bo) | 57 | static inline void radeon_bo_unreserve(struct radeon_bo *bo) |
58 | { | 58 | { |