Commit 092599da authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 73a60c0d

drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c

+2 −17
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ nv50_channel_del(struct nouveau_channel **pchan) 
	if (!chan)

	if (!chan)

		return;

		return;





	nouveau_gpuobj_ref(NULL, &chan->ramfc);

	nouveau_vm_ref(NULL, &chan->vm, chan->vm_pd);

	nouveau_vm_ref(NULL, &chan->vm, chan->vm_pd);

	nouveau_gpuobj_ref(NULL, &chan->vm_pd);

	nouveau_gpuobj_ref(NULL, &chan->vm_pd);

	if (drm_mm_initialized(&chan->ramin_heap))

	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;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	u32 pgd = (dev_priv->chipset == 0x50) ? 0x1400 : 0x0200;

	u32 pgd = (dev_priv->chipset == 0x50) ? 0x1400 : 0x0200;

	u32  fc = (dev_priv->chipset == 0x50) ? 0x0000 : 0x4200;

	struct nouveau_channel *chan;

	struct nouveau_channel *chan;

	int ret, i;

	int ret, i;
@@ -83,17 +81,13 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, 
		return ret;

		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) {

	if (ret) {

		nv50_channel_del(&chan);

		nv50_channel_del(&chan);

		return ret;

		return ret;

	}

	}





	ret = nouveau_gpuobj_new_fake(dev, chan->ramin->pinst == ~0 ? ~0 :

	ret = nouveau_gpuobj_new(dev, chan, 0x4000, 0, 0, &chan->vm_pd);

				      chan->ramin->pinst + pgd,

				      chan->ramin->vinst + pgd,

				      0x4000, NVOBJ_FLAG_ZERO_ALLOC,

				      &chan->vm_pd);

	if (ret) {

	if (ret) {

		nv50_channel_del(&chan);

		nv50_channel_del(&chan);

		return ret;

		return ret;
@@ -110,15 +104,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, 
		return ret;

		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;

	*pchan = chan;

	return 0;

	return 0;

}

}