diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-14 10:48:12 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:52 +1000 |
| commit | 092599da308bf56b96c849ecdd315b8a1a13ca52 (patch) | |
| tree | f89cfe060187e5c2d982844bdc268f3d036a69af | |
| parent | 73a60c0d218a292f8ef29d3467726ff26ed366fc (diff) | |
| download | op-kernel-dev-092599da308bf56b96c849ecdd315b8a1a13ca52.zip op-kernel-dev-092599da308bf56b96c849ecdd315b8a1a13ca52.tar.gz | |
drm/nv50/instmem: remove use of nouveau_gpuobj_new_fake()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c index be7344d..f88530b 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c @@ -53,7 +53,6 @@ nv50_channel_del(struct nouveau_channel **pchan) if (!chan) return; - nouveau_gpuobj_ref(NULL, &chan->ramfc); nouveau_vm_ref(NULL, &chan->vm, chan->vm_pd); nouveau_gpuobj_ref(NULL, &chan->vm_pd); if (drm_mm_initialized(&chan->ramin_heap)) @@ -68,7 +67,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, { struct drm_nouveau_private *dev_priv = dev->dev_private; u32 pgd = (dev_priv->chipset == 0x50) ? 0x1400 : 0x0200; - u32 fc = (dev_priv->chipset == 0x50) ? 0x0000 : 0x4200; struct nouveau_channel *chan; int ret, i; @@ -83,17 +81,13 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, return ret; } - ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size - 0x6000); + ret = drm_mm_init(&chan->ramin_heap, pgd, chan->ramin->size - pgd); if (ret) { nv50_channel_del(&chan); return ret; } - ret = nouveau_gpuobj_new_fake(dev, chan->ramin->pinst == ~0 ? ~0 : - chan->ramin->pinst + pgd, - chan->ramin->vinst + pgd, - 0x4000, NVOBJ_FLAG_ZERO_ALLOC, - &chan->vm_pd); + ret = nouveau_gpuobj_new(dev, chan, 0x4000, 0, 0, &chan->vm_pd); if (ret) { nv50_channel_del(&chan); return ret; @@ -110,15 +104,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, return ret; } - ret = nouveau_gpuobj_new_fake(dev, chan->ramin->pinst == ~0 ? ~0 : - chan->ramin->pinst + fc, - chan->ramin->vinst + fc, 0x100, - NVOBJ_FLAG_ZERO_ALLOC, &chan->ramfc); - if (ret) { - nv50_channel_del(&chan); - return ret; - } - *pchan = chan; return 0; } |
