From: Christian König <deathsimple@vodafone.de>
Date: Wed, 2 May 2012 13:11:22 +0000 (+0200)
Subject: drm/radeon: unlock the ring mutex while waiting for the next fence
X-Git-Tag: v3.5-rc1~83^2~65
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=67e3c7876878264a81afe0dceb8ac653af8387be;p=karo-tx-linux.git

drm/radeon: unlock the ring mutex while waiting for the next fence

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>
---

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 08e1578f55f8..407d90aaa0c3 100644
--- 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;
 	}