From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 24 Nov 2010 00:18:28 +0000 (+1000)
Subject: drm/nvc0: skip dma object creation for drm channel
X-Git-Tag: v2.6.38-rc1~419^2~24^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5216782bf8c195de3befe0742a877c987dd3c4fd;p=~shefty%2Frdma-dev.git

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 813790f4c7c..d5b17b6ccd3 100644
--- 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;