Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca130c22 authored Nov 20, 2010 by Francisco Jerez

drm/nv04-nv40: Give "gpuobj->cinst" the same meaning as on nv50.



No functional changes, just simplify some code paths a bit.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent 2e5702af

drivers/gpu/drm/nouveau/nouveau_object.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -202,11 +202,7 @@ nouveau_gpuobj_new(struct drm_device dev, struct nouveau_channel chan,
		if (gpuobj->pinst != ~0)
		gpuobj->pinst += ramin->start;

		if (dev_priv->card_type < NV_50)
		gpuobj->cinst = gpuobj->pinst;
		else
		gpuobj->cinst = ramin->start;

		gpuobj->vinst = ramin->start + chan->ramin->vinst;
		gpuobj->node = ramin;
		} else {

drivers/gpu/drm/nouveau/nouveau_ramht.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -104,12 +104,12 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle,
		nouveau_gpuobj_ref(gpuobj, &entry->gpuobj);

		if (dev_priv->card_type < NV_40) {
		ctx = NV_RAMHT_CONTEXT_VALID \| (gpuobj->cinst >> 4) \|
		ctx = NV_RAMHT_CONTEXT_VALID \| (gpuobj->pinst >> 4) \|
		(chan->id << NV_RAMHT_CONTEXT_CHANNEL_SHIFT) \|
		(gpuobj->engine << NV_RAMHT_CONTEXT_ENGINE_SHIFT);
		} else
		if (dev_priv->card_type < NV_50) {
		ctx = (gpuobj->cinst >> 4) \|
		ctx = (gpuobj->pinst >> 4) \|
		(chan->id << NV40_RAMHT_CONTEXT_CHANNEL_SHIFT) \|
		(gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT);
		} else {

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -241,12 +241,6 @@ nouveau_sgdma_init(struct drm_device *dev)
		}

		if (dev_priv->card_type < NV_50) {
		/* special case, allocated from global instmem heap so
		* cinst is invalid, we use it on all channels though so
		* cinst needs to be valid, set it the same as pinst
		*/
		gpuobj->cinst = gpuobj->pinst;

		nv_wo32(gpuobj, 0, NV_CLASS_DMA_IN_MEMORY \|
		(1 << 12) /* PT present */ \|
		(0 << 13) /* PT not linear */ \|