diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-23 10:10:24 +1000 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-08 03:00:35 +0100 |
| commit | ceac30999dfb00ee7b56cfea8b28ef50999a3c95 (patch) | |
| tree | b0295cf2caf466d94e35103a3c1b6d4baf57f4eb /drivers/gpu/drm/nouveau/nouveau_dma.c | |
| parent | d908175cca901b95ba1628428b216e6e7188e8fb (diff) | |
| download | lwn-ceac30999dfb00ee7b56cfea8b28ef50999a3c95.tar.gz lwn-ceac30999dfb00ee7b56cfea8b28ef50999a3c95.zip | |
drm/nouveau: implicitly insert non-DMA objects into RAMHT
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dma.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index 82581e600dcd..6ff77cedc008 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -59,17 +59,11 @@ nouveau_dma_init(struct nouveau_channel *chan) { struct drm_device *dev = chan->dev; struct drm_nouveau_private *dev_priv = dev->dev_private; - struct nouveau_gpuobj *obj = NULL; int ret, i; /* Create NV_MEMORY_TO_MEMORY_FORMAT for buffer moves */ - ret = nouveau_gpuobj_gr_new(chan, dev_priv->card_type < NV_50 ? - 0x0039 : 0x5039, &obj); - if (ret) - return ret; - - ret = nouveau_ramht_insert(chan, NvM2MF, obj); - nouveau_gpuobj_ref(NULL, &obj); + ret = nouveau_gpuobj_gr_new(chan, NvM2MF, dev_priv->card_type < NV_50 ? + 0x0039 : 0x5039); if (ret) return ret; |