From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 14 Jul 2012 00:48:12 +0000 (+1000)
Subject: drm/nv50/instmem: remove use of nouveau_gpuobj_new_fake()
X-Git-Tag: Ubuntu-5.0.0-8.9~15148^2^2~71
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=092599da308bf56b96c849ecdd315b8a1a13ca52;p=mirror_ubuntu-disco-kernel.git

drm/nv50/instmem: remove use of nouveau_gpuobj_new_fake()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
index be7344d1334d..f88530b96ec3 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;
 }