git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://github.com/davem330/sparc
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_fence.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index
8d02d87
..
c919cfc
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_fence.c
@@
-530,7
+530,8
@@
nouveau_fence_channel_init(struct nouveau_channel *chan)
nouveau_gpuobj_ref(NULL, &obj);
if (ret)
return ret;
- } else {
+ } else
+ if (USE_SEMA(dev)) {
/* map fence bo into channel's vm */
ret = nouveau_bo_vma_add(dev_priv->fence.bo, chan->vm,
&chan->fence.vma);