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

Commit 63f8c9b7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo/gk110: expose KeplerChannelGpfifoB 



This class supports a WFI method (0x0078) that's not present on the
KeplerChannelGpfifoA class.

The binary driver exposes both classes on these GPUs for some reason,
though there doesn't appear to be any difference in the setup that's
done for each (ie. even if you allocate GpfifoA, the WFI method will
still work).

We shall just expose GpfifoB, as I don't see a good reason to report
the presence of both.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define G82_CHANNEL_GPFIFO                            /* cl826f.h */ 0x0000826f

#define FERMI_CHANNEL_GPFIFO                          /* cl906f.h */ 0x0000906f

#define KEPLER_CHANNEL_GPFIFO_A                       /* cla06f.h */ 0x0000a06f

#define KEPLER_CHANNEL_GPFIFO_B                       /* cla06f.h */ 0x0000a16f

#define MAXWELL_CHANNEL_GPFIFO_A                      /* cla06f.h */ 0x0000b06f



#define NV50_DISP                                     /* cl5070.h */ 0x00005070

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ int nv50_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **); 
int g84_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gf100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk104_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk110_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk208_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk20a_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

drivers/gpu/drm/nouveau/nouveau_chan.c

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, 
		    u32 engine, struct nouveau_channel **pchan)

{

	static const u16 oclasses[] = { MAXWELL_CHANNEL_GPFIFO_A,

					KEPLER_CHANNEL_GPFIFO_B,

					KEPLER_CHANNEL_GPFIFO_A,

					FERMI_CHANNEL_GPFIFO,

					G82_CHANNEL_GPFIFO,

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ nouveau_accel_init(struct nouveau_drm *drm) 
			break;

		case FERMI_CHANNEL_GPFIFO:

		case KEPLER_CHANNEL_GPFIFO_A:

		case KEPLER_CHANNEL_GPFIFO_B:

		case MAXWELL_CHANNEL_GPFIFO_A:

			ret = nvc0_fence_create(drm);

			break;

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

+2 −2
Original line number Diff line number Diff line
@@ -1827,7 +1827,7 @@ nvf0_chipset = { 
	.ce[2] = gk104_ce_new,

	.disp = gk110_disp_new,

	.dma = gf119_dma_new,

	.fifo = gk104_fifo_new,

	.fifo = gk110_fifo_new,

	.gr = gk110_gr_new,

	.mspdec = gk104_mspdec_new,

	.msppp = gf100_msppp_new,
@@ -1864,7 +1864,7 @@ nvf1_chipset = { 
	.ce[2] = gk104_ce_new,

	.disp = gk110_disp_new,

	.dma = gf119_dma_new,

	.fifo = gk104_fifo_new,

	.fifo = gk110_fifo_new,

	.gr = gk110b_gr_new,

	.mspdec = gk104_mspdec_new,

	.msppp = gf100_msppp_new,