diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-24 10:18:28 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 17:17:31 +1000 |
| commit | 5216782bf8c195de3befe0742a877c987dd3c4fd (patch) | |
| tree | 9d6fc0c8c144393362f32f2006c69e223bc032a7 | |
| parent | effd6e066f406277254ad7603cf2c7465c4f114b (diff) | |
| download | kernel_samsung_smdk4412-5216782bf8c195de3befe0742a877c987dd3c4fd.zip kernel_samsung_smdk4412-5216782bf8c195de3befe0742a877c987dd3c4fd.tar.gz kernel_samsung_smdk4412-5216782bf8c195de3befe0742a877c987dd3c4fd.tar.bz2 | |
drm/nvc0: skip dma object creation for drm channel
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 813790f..d5b17b6 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; |