projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3368ff0
)
drm/radeon: unlock the ring mutex while waiting for the next fence
author
Christian König
<deathsimple@vodafone.de>
Wed, 2 May 2012 13:11:22 +0000
(15:11 +0200)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 3 May 2012 08:16:37 +0000
(09:16 +0100)
Fixing just another deadlock problem with gpu reset tests.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_ring.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/radeon_ring.c
b/drivers/gpu/drm/radeon/radeon_ring.c
index
08e1578
..
407d90a
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_ring.c
+++ b/
drivers/gpu/drm/radeon/radeon_ring.c
@@
-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;
}