diff options
| author | Ben Skeggs | 2010-11-16 01:13:05 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2010-12-08 04:48:17 +0100 |
| commit | b571fe21f5c24760368b3fb927af5a7384d7721b (patch) | |
| tree | a49f85fdf8ef3a3c9b969c0fbbe36c7fd2b6e40d /drivers/gpu/drm/nouveau/nv50_instmem.c | |
| parent | drm/nv50: enable non-contig vram allocations where requested (diff) | |
| download | kernel-qcow2-linux-b571fe21f5c24760368b3fb927af5a7384d7721b.tar.gz kernel-qcow2-linux-b571fe21f5c24760368b3fb927af5a7384d7721b.tar.xz kernel-qcow2-linux-b571fe21f5c24760368b3fb927af5a7384d7721b.zip | |
drm/nv50: tidy up PCIEGART implementation
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 08202fd682e4..ec102bda8446 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -131,7 +131,6 @@ nv50_instmem_init(struct drm_device *dev) struct nouveau_channel *chan; struct nouveau_vm *vm; int ret, i; - u64 nongart_o; u32 tmp; priv = kzalloc(sizeof(*priv), GFP_KERNEL); @@ -216,15 +215,10 @@ nv50_instmem_init(struct drm_device *dev) for (i = 0; i < 8; i++) nv_wr32(dev, 0x1900 + (i*4), 0); - /* Create shared channel VM, space is reserved for GART mappings at - * the beginning of this address space, it's managed separately - * because TTM makes life painful + /* Create shared channel VM, space is reserved at the beginning + * to catch "NULL pointer" references */ - dev_priv->vm_gart_base = 0x0020000000ULL; - dev_priv->vm_gart_size = 512 * 1024 * 1024; - nongart_o = dev_priv->vm_gart_base + dev_priv->vm_gart_size; - - ret = nouveau_vm_new(dev, 0, (1ULL << 40), nongart_o, + ret = nouveau_vm_new(dev, 0, (1ULL << 40), 0x0020000000ULL, 29, 12, 16, &dev_priv->chan_vm); if (ret) return ret; |