summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_object.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-16 10:13:05 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-12-08 13:48:17 +1000
commitb571fe21f5c24760368b3fb927af5a7384d7721b (patch)
treea49f85fdf8ef3a3c9b969c0fbbe36c7fd2b6e40d /drivers/gpu/drm/nouveau/nouveau_object.c
parent5f6fdca570b13a8a2c9cab9ab6edfc17487049cf (diff)
downloadblackbird-op-linux-b571fe21f5c24760368b3fb927af5a7384d7721b.tar.gz
blackbird-op-linux-b571fe21f5c24760368b3fb927af5a7384d7721b.zip
drm/nv50: tidy up PCIEGART implementation
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_object.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_object.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index 573fd7316d63..d1bed40dc449 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -433,7 +433,7 @@ nv50_gpuobj_dma_init(struct nouveau_gpuobj *obj, u32 offset, int class,
flags0 |= 0x00030000;
break;
case NV_MEM_TARGET_GART:
- base += dev_priv->vm_gart_base;
+ base += dev_priv->gart_info.aper_base;
default:
flags0 &= ~0x00100000;
break;
@@ -801,7 +801,6 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
return ret;
nouveau_vm_ref(dev_priv->chan_vm, &chan->vm, chan->vm_pd);
- chan->vm->map_pgt(chan->vm_pd, 12, 1, dev_priv->gart_info.sg_ctxdma);
}
/* RAMHT */
@@ -889,7 +888,6 @@ nouveau_gpuobj_channel_takedown(struct nouveau_channel *chan)
nouveau_vm_ref(NULL, &chan->vm, chan->vm_pd);
nouveau_gpuobj_ref(NULL, &chan->vm_pd);
- nouveau_gpuobj_ref(NULL, &chan->vm_gart_pt);
if (chan->ramin_heap.free_stack.next)
drm_mm_takedown(&chan->ramin_heap);
OpenPOWER on IntegriCloud