drm/nvc0: skip dma object creation for drm channel

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 813790f4c7c7f94e48d07ab0feaf60751ea3b5a9..d5b17b6ccd3a5493a69f6d30b833f2a2328667ea 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -552,6 +552,10 @@ nouveau_card_init_channel(struct drm_device *dev)
        if (ret)
                return ret;
 
+       /* no dma objects on fermi... */
+       if (dev_priv->card_type >= NV_C0)
+               goto out_done;
+
        ret = nouveau_gpuobj_dma_new(dev_priv->channel, NV_CLASS_DMA_IN_MEMORY,
                                     0, dev_priv->vram_size,
                                     NV_MEM_ACCESS_RW, NV_MEM_TARGET_VRAM,
@@ -576,6 +580,7 @@ nouveau_card_init_channel(struct drm_device *dev)
        if (ret)
                goto out_err;
 
+out_done:
        mutex_unlock(&dev_priv->channel->mutex);
        return 0;