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

Commit 89025bd4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo/gm204: initial support 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define G82_CHANNEL_GPFIFO                                           0x0000826f

#define FERMI_CHANNEL_GPFIFO                                         0x0000906f

#define KEPLER_CHANNEL_GPFIFO_A                                      0x0000a06f

#define MAXWELL_CHANNEL_GPFIFO_A                                     0x0000b06f



#define NV50_DISP                                                    0x00005070

#define G82_DISP                                                     0x00008270

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ extern struct nvkm_oclass *gf100_fifo_oclass; 
extern struct nvkm_oclass *gk104_fifo_oclass;

extern struct nvkm_oclass *gk20a_fifo_oclass;

extern struct nvkm_oclass *gk208_fifo_oclass;

extern struct nvkm_oclass *gm204_fifo_oclass;



int  nvkm_fifo_uevent_ctor(struct nvkm_object *, void *, u32,

			   struct nvkm_notify *);

drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c

+2 −2
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ gm100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  gm204_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_GR     ] =  gm107_gr_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DISP   ] =  gm204_disp_oclass;

drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ nvkm-y += nvkm/engine/fifo/gf100.o 
nvkm-y += nvkm/engine/fifo/gk104.o

nvkm-y += nvkm/engine/fifo/gk20a.o

nvkm-y += nvkm/engine/fifo/gk208.o

nvkm-y += nvkm/engine/fifo/gm204.o

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

+4 −3
Original line number Diff line number Diff line
@@ -323,8 +323,8 @@ gk104_fifo_chan_fini(struct nvkm_object *object, bool suspend) 
	return nvkm_fifo_channel_fini(&chan->base, suspend);

}



static struct nvkm_ofuncs

gk104_fifo_ofuncs = {

struct nvkm_ofuncs

gk104_fifo_chan_ofuncs = {

	.ctor = gk104_fifo_chan_ctor,

	.dtor = _nvkm_fifo_channel_dtor,

	.init = gk104_fifo_chan_init,
@@ -337,7 +337,7 @@ gk104_fifo_ofuncs = { 


static struct nvkm_oclass

gk104_fifo_sclass[] = {

	{ KEPLER_CHANNEL_GPFIFO_A, &gk104_fifo_ofuncs },

	{ KEPLER_CHANNEL_GPFIFO_A, &gk104_fifo_chan_ofuncs },

	{}

};
@@ -774,6 +774,7 @@ gk104_fifo_intr_fault(struct gk104_fifo_priv *priv, int unit) 
	while (object) {

		switch (nv_mclass(object)) {

		case KEPLER_CHANNEL_GPFIFO_A:

		case MAXWELL_CHANNEL_GPFIFO_A:

			gk104_fifo_recover(priv, engine, (void *)object);

			break;

		}