Commit 503b0f1c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: separate object classes for dma channels 



Future code will use the object class rather than chipset checks in order to
identify available channel features.

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

drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c

+3 −0
Original line number Diff line number Diff line
@@ -118,7 +118,10 @@ nv04_dmaobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
		return ret;



	switch (nv_mclass(parent)) {

	case 0x006b:

	case 0x006e:

	case 0x176e:

	case 0x406e:

		ret = dmaeng->bind(dmaeng, *pobject, &dmaobj->base, &gpuobj);

		nouveau_object_ref(NULL, pobject);

		*pobject = nv_object(gpuobj);

drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ nv04_fifo_ofuncs = { 


static struct nouveau_oclass

nv04_fifo_sclass[] = {

	{ 0x006e, &nv04_fifo_ofuncs },

	{ 0x006b, &nv04_fifo_ofuncs },

	{}

};

drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ nv17_fifo_ofuncs = { 


static struct nouveau_oclass

nv17_fifo_sclass[] = {

	{ 0x006e, &nv17_fifo_ofuncs },

	{ 0x176e, &nv17_fifo_ofuncs },

	{}

};

drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ nv40_fifo_ofuncs = { 


static struct nouveau_oclass

nv40_fifo_sclass[] = {

	{ 0x006e, &nv40_fifo_ofuncs },

	{ 0x406e, &nv40_fifo_ofuncs },

	{}

};

drivers/gpu/drm/nouveau/core/include/core/class.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct nv_dma_class { 


/* 006b: NV03_CHANNEL_DMA

 * 006e: NV10_CHANNEL_DMA

 * 176e: NV17_CHANNEL_DMA

 * 406e: NV40_CHANNEL_DMA

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE