From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 11 Oct 2010 22:01:59 +0000 (+1000)
Subject: drm/nouveau: fix thinko in channel locking in semaphore path
X-Git-Tag: v2.6.38-rc1~419^2~37^2~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08cd3d4311fb9c5038bc6fb0c83c250cfb218da2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

drm/nouveau: fix thinko in channel locking in semaphore path

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 42694b1..5f9f66f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -393,23 +393,23 @@ nouveau_fence_sync(struct nouveau_fence *fence,
 		return nouveau_fence_wait(fence, NULL, false, false);
 	}
 
-	/* try to take wchan's mutex, if we can't take it right away
+	/* try to take chan's mutex, if we can't take it right away
 	 * we have to fallback to software sync to prevent locking
 	 * order issues
 	 */
-	if (!mutex_trylock(&wchan->mutex)) {
+	if (!mutex_trylock(&chan->mutex)) {
 		free_semaphore(&sema->ref);
 		return nouveau_fence_wait(fence, NULL, false, false);
 	}
 
 	/* Make wchan wait until it gets signalled */
 	ret = emit_semaphore(wchan, NV_SW_SEMAPHORE_ACQUIRE, sema);
-	mutex_unlock(&wchan->mutex);
 	if (ret)
 		goto out;
 
 	/* Signal the semaphore from chan */
 	ret = emit_semaphore(chan, NV_SW_SEMAPHORE_RELEASE, sema);
+	mutex_unlock(&chan->mutex);
 out:
 	kref_put(&sema->ref, free_semaphore);
 	return ret;