drm/nouveau: fix oops on pre-semaphore hardware
authorBen Skeggs <bskeggs@redhat.com>
Tue, 23 Aug 2011 00:23:11 +0000 (10:23 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 9 Sep 2011 07:24:00 +0000 (17:24 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_fence.c

index 8d02d875376d5979cf48986aef57e8a0f5216d17..c919cfc8f2fdf762589ba5db144be75e3066fb6d 100644 (file)
@@ -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);