Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211468
b: refs/heads/master
c: a8c051f
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare authored and Dave Airlie committed Oct 12, 2010
1 parent 2e5ff04 commit 5a040b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d31dba58480c3cdd458f449261d72ecd15287792
refs/heads/master: a8c051f0c8d2f81c665e820f765aaddf86161640
5 changes: 1 addition & 4 deletions trunk/drivers/gpu/drm/radeon/radeon_object.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,8 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type,
int r;

r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
if (unlikely(r != 0)) {
if (r != -ERESTARTSYS)
dev_err(bo->rdev->dev, "%p reserve failed for wait\n", bo);
if (unlikely(r != 0))
return r;
}
spin_lock(&bo->tbo.lock);
if (mem_type)
*mem_type = bo->tbo.mem.mem_type;
Expand Down

0 comments on commit 5a040b1

Please sign in to comment.