Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218275
b: refs/heads/master
c: 965d380
h: refs/heads/master
i:
  218273: 334c10e
  218271: b12d92a
v: v3
  • Loading branch information
Jean Delvare authored and Dave Airlie committed Oct 19, 2010
1 parent 19300a8 commit 1a2ddb6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 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: 5480f727dc4c049eb46b191bfaeb034067aa6835
refs/heads/master: 965d38074e6eae71757a8baf9a348139e1e6894d
9 changes: 2 additions & 7 deletions trunk/drivers/gpu/drm/ttm/ttm_bo.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,13 @@ static void ttm_bo_release_list(struct kref *list_kref)

int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
{

if (interruptible) {
int ret = 0;

ret = wait_event_interruptible(bo->event_queue,
return wait_event_interruptible(bo->event_queue,
atomic_read(&bo->reserved) == 0);
if (unlikely(ret != 0))
return ret;
} else {
wait_event(bo->event_queue, atomic_read(&bo->reserved) == 0);
return 0;
}
return 0;
}
EXPORT_SYMBOL(ttm_bo_wait_unreserved);

Expand Down

0 comments on commit 1a2ddb6

Please sign in to comment.