hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-10-12 08:01:59 +10:00
parent 21e86c1c8a
commit 08cd3d4311
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nouveau_fence.c
View File

@ -393,23 +393,23 @@ nouveau_fence_sync(struct nouveau_fence *fence,
return nouveau_fence_wait(fence, NULL, false, false); 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 * we have to fallback to software sync to prevent locking
* order issues * order issues
*/ */
if (!mutex_trylock(&wchan->mutex)) { if (!mutex_trylock(&chan->mutex)) {
free_semaphore(&sema->ref); free_semaphore(&sema->ref);
return nouveau_fence_wait(fence, NULL, false, false); return nouveau_fence_wait(fence, NULL, false, false);
} }
/* Make wchan wait until it gets signalled */ /* Make wchan wait until it gets signalled */
ret = emit_semaphore(wchan, NV_SW_SEMAPHORE_ACQUIRE, sema); ret = emit_semaphore(wchan, NV_SW_SEMAPHORE_ACQUIRE, sema);
mutex_unlock(&wchan->mutex);
if (ret) if (ret)
goto out; goto out;
/* Signal the semaphore from chan */ /* Signal the semaphore from chan */
ret = emit_semaphore(chan, NV_SW_SEMAPHORE_RELEASE, sema); ret = emit_semaphore(chan, NV_SW_SEMAPHORE_RELEASE, sema);
mutex_unlock(&chan->mutex);
out: out:
kref_put(&sema->ref, free_semaphore); kref_put(&sema->ref, free_semaphore);
return ret; return ret;