projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3461a2
)
drm/nouveau: drop drm_global_mutex before sleeping in submission path
author
Ben Skeggs
<bskeggs@redhat.com>
Thu, 26 Aug 2010 05:02:32 +0000
(15:02 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 26 Aug 2010 22:39:23 +0000
(08:39 +1000)
If we keep hold of the mutex here, the process which currently holds the
buffer object will never be able to release it, causing a deadlock.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_gem.c
b/drivers/gpu/drm/nouveau/nouveau_gem.c
index
613f878
..
93711df
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_gem.c
@@
-337,7
+337,9
@@
retry:
return -EINVAL;
}
+ mutex_unlock(&drm_global_mutex);
ret = ttm_bo_wait_cpu(&nvbo->bo, false);
+ mutex_lock(&drm_global_mutex);
if (ret) {
NV_ERROR(dev, "fail wait_cpu\n");
return ret;