From 4ccc072314c5fac8c0e5b75a6434d768524b7c16 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 23 Aug 2011 10:23:11 +1000
Subject: [PATCH] --- yaml --- r: 263763 b: refs/heads/master c:
 cfd8be088e97a762902a4820f501fb13102984e9 h: refs/heads/master i:   263761:
 4a25e180e58ca61d7880f19d4dfae95f3efa8b21   263759:
 c3b65c4a505dead29958e5c8d2ae2448684c25f8 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7b3f701fc4ea..df39b74eb8a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffbc559b0699891c6deb9fd2b4750671eab94999
+refs/heads/master: cfd8be088e97a762902a4820f501fb13102984e9
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
index 8d02d875376d..c919cfc8f2fd 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/trunk/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);