diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-04 12:41:37 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-01-07 14:03:58 +1000 |
| commit | e457acaed4c56a6831b82365e17e8f42f1ee129c (patch) | |
| tree | fe1d6ab6e926e118ad7dbdce56fa7a79671962c3 /drivers/gpu/drm/nouveau/nouveau_channel.c | |
| parent | eeb9cc015f91ff08453040dd5b2fde0dbaac90d3 (diff) | |
| download | kernel_samsung_smdk4412-e457acaed4c56a6831b82365e17e8f42f1ee129c.zip kernel_samsung_smdk4412-e457acaed4c56a6831b82365e17e8f42f1ee129c.tar.gz kernel_samsung_smdk4412-e457acaed4c56a6831b82365e17e8f42f1ee129c.tar.bz2 | |
drm/nouveau: create grctx on the fly on all chipsets
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_channel.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_channel.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index a57a1d2..3960d66 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c @@ -121,7 +121,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, uint32_t vram_handle, uint32_t gart_handle) { struct drm_nouveau_private *dev_priv = dev->dev_private; - struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph; struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo; struct nouveau_channel *chan; unsigned long flags; @@ -202,15 +201,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, /* disable the fifo caches */ pfifo->reassign(dev, false); - /* Create a graphics context for new channel */ - if (dev_priv->card_type < NV_50) { - ret = pgraph->create_context(chan); - if (ret) { - nouveau_channel_put(&chan); - return ret; - } - } - /* Construct inital RAMFC for new channel */ ret = pfifo->create_context(chan); if (ret) { |