Commit 641d0b30 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo/tu104: initial support 



Various different bits and pieces vs GV100.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#define MAXWELL_CHANNEL_GPFIFO_A                      /* cla06f.h */ 0x0000b06f

#define PASCAL_CHANNEL_GPFIFO_A                       /* cla06f.h */ 0x0000c06f

#define VOLTA_CHANNEL_GPFIFO_A                        /* clc36f.h */ 0x0000c36f

#define TURING_CHANNEL_GPFIFO_A                       /* clc36f.h */ 0x0000c46f



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

#define G82_DISP                                      /* cl5070.h */ 0x00008270

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

+1 −0
Original line number Diff line number Diff line
@@ -74,4 +74,5 @@ int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **); 
int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

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

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

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

#endif

drivers/gpu/drm/nouveau/nouveau_chan.c

+2 −1
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, 
		    u64 runlist, bool priv, struct nouveau_channel **pchan)

{

	struct nouveau_cli *cli = (void *)device->object.client;

	static const u16 oclasses[] = { VOLTA_CHANNEL_GPFIFO_A,

	static const u16 oclasses[] = { TURING_CHANNEL_GPFIFO_A,

					VOLTA_CHANNEL_GPFIFO_A,

					PASCAL_CHANNEL_GPFIFO_A,

					MAXWELL_CHANNEL_GPFIFO_A,

					KEPLER_CHANNEL_GPFIFO_B,

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ nouveau_accel_init(struct nouveau_drm *drm) 
		case MAXWELL_CHANNEL_GPFIFO_A:

		case PASCAL_CHANNEL_GPFIFO_A:

		case VOLTA_CHANNEL_GPFIFO_A:

		case TURING_CHANNEL_GPFIFO_A:

			ret = nvc0_fence_create(drm);

			break;

		default:

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

+1 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,7 @@ nv164_chipset = { 
	.top = gk104_top_new,

	.disp = tu104_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu104_fifo_new,

};



static int