Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307222
b: refs/heads/master
c: 67e3c78
h: refs/heads/master
v: v3
  • Loading branch information
Christian König authored and Dave Airlie committed May 3, 2012
1 parent bf9ccef commit f2483ae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3368ff0cf483005bd327372049f2bf43dc63730a
refs/heads/master: 67e3c7876878264a81afe0dceb8ac653af8387be
2 changes: 2 additions & 0 deletions trunk/drivers/gpu/drm/radeon/radeon_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,9 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsi
if (ndw < ring->ring_free_dw) {
break;
}
mutex_unlock(&ring->mutex);
r = radeon_fence_wait_next(rdev, radeon_ring_index(rdev, ring));
mutex_lock(&ring->mutex);
if (r)
return r;
}
Expand Down

0 comments on commit f2483ae

Please sign in to comment.