OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da3bd82
)
drm/nouveau: Fix sleep while atomic in the semaphore code.
author
Francisco Jerez
<currojerez@riseup.net>
Sat, 9 Oct 2010 02:02:09 +0000
(
04:02
+0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 18 Nov 2010 04:38:10 +0000
(14:38 +1000)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_fence.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index
441b124
..
ab1bbfb
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_fence.c
@@
-249,6
+249,7
@@
alloc_semaphore(struct drm_device *dev)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_semaphore *sema;
+ int ret;
if (!USE_SEMA(dev))
return NULL;
@@
-257,10
+258,14
@@
alloc_semaphore(struct drm_device *dev)
if (!sema)
goto fail;
+ ret = drm_mm_pre_get(&dev_priv->fence.heap);
+ if (ret)
+ goto fail;
+
spin_lock(&dev_priv->fence.lock);
sema->mem = drm_mm_search_free(&dev_priv->fence.heap, 4, 0, 0);
if (sema->mem)
- sema->mem = drm_mm_get_block(sema->mem, 4, 0);
+ sema->mem = drm_mm_get_block
_atomic
(sema->mem, 4, 0);
spin_unlock(&dev_priv->fence.lock);
if (!sema->mem)