Commit 08cd3d43 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 21e86c1c
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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;