commit cfd8be088e97a762902a4820f501fb13102984e9
author Ben Skeggs <bskeggs@redhat.com> Tue Aug 23 10:23:11 2011 +1000
committer Ben Skeggs <bskeggs@redhat.com> Fri Sep 09 17:24:00 2011 +1000
tree d913c9553696025f445692dbef1cf1010fb17c1b
parent ffbc559b0699891c6deb9fd2b4750671eab94999

drm/nouveau: fix oops on pre-semaphore hardware

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

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
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -530,7 +530,8 @@
 		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);