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

Commit 114b6556 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/tu104: initial support 



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

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

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#define GP100_DISP                                    /* cl5070.h */ 0x00009770

#define GP102_DISP                                    /* cl5070.h */ 0x00009870

#define GV100_DISP                                    /* cl5070.h */ 0x0000c370

#define TU104_DISP                                    /* cl5070.h */ 0x0000c570



#define NV31_MPEG                                                    0x00003174

#define G82_MPEG                                                     0x00008274
@@ -95,6 +96,7 @@ 
#define GF110_DISP_CURSOR                             /* cl507a.h */ 0x0000907a

#define GK104_DISP_CURSOR                             /* cl507a.h */ 0x0000917a

#define GV100_DISP_CURSOR                             /* cl507a.h */ 0x0000c37a

#define TU104_DISP_CURSOR                             /* cl507a.h */ 0x0000c57a



#define NV50_DISP_OVERLAY                             /* cl507b.h */ 0x0000507b

#define G82_DISP_OVERLAY                              /* cl507b.h */ 0x0000827b
@@ -103,6 +105,7 @@ 
#define GK104_DISP_OVERLAY                            /* cl507b.h */ 0x0000917b



#define GV100_DISP_WINDOW_IMM_CHANNEL_DMA             /* clc37b.h */ 0x0000c37b

#define TU104_DISP_WINDOW_IMM_CHANNEL_DMA             /* clc37b.h */ 0x0000c57b



#define NV50_DISP_BASE_CHANNEL_DMA                    /* cl507c.h */ 0x0000507c

#define G82_DISP_BASE_CHANNEL_DMA                     /* cl507c.h */ 0x0000827c
@@ -125,6 +128,7 @@ 
#define GP100_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000977d

#define GP102_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000987d

#define GV100_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000c37d

#define TU104_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000c57d



#define NV50_DISP_OVERLAY_CHANNEL_DMA                 /* cl507e.h */ 0x0000507e

#define G82_DISP_OVERLAY_CHANNEL_DMA                  /* cl507e.h */ 0x0000827e
@@ -134,6 +138,7 @@ 
#define GK104_DISP_OVERLAY_CONTROL_DMA                /* cl507e.h */ 0x0000917e



#define GV100_DISP_WINDOW_CHANNEL_DMA                 /* clc37e.h */ 0x0000c37e

#define TU104_DISP_WINDOW_CHANNEL_DMA                 /* clc37e.h */ 0x0000c57e



#define NV50_TESLA                                                   0x00005097

#define G82_TESLA                                                    0x00008297

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

+1 −0
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ int gm200_disp_new(struct nvkm_device *, int, struct nvkm_disp **); 
int gp100_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gp102_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gv100_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int tu104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

#endif

drivers/gpu/drm/nouveau/nvif/disp.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ int 
nvif_disp_ctor(struct nvif_device *device, s32 oclass, struct nvif_disp *disp)

{

	static const struct nvif_mclass disps[] = {

		{ TU104_DISP, -1 },

		{ GV100_DISP, -1 },

		{ GP102_DISP, -1 },

		{ GP100_DISP, -1 },

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

+1 −0
Original line number Diff line number Diff line
@@ -2456,6 +2456,7 @@ nv164_chipset = { 
	.therm = gp100_therm_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.disp = tu104_disp_new,

	.dma = gv100_dma_new,

};

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

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ nvkm-y += nvkm/engine/disp/gm200.o 
nvkm-y += nvkm/engine/disp/gp100.o

nvkm-y += nvkm/engine/disp/gp102.o

nvkm-y += nvkm/engine/disp/gv100.o

nvkm-y += nvkm/engine/disp/tu104.o

nvkm-y += nvkm/engine/disp/vga.o



nvkm-y += nvkm/engine/disp/head.o
@@ -38,6 +39,7 @@ nvkm-y += nvkm/engine/disp/sorgk104.o 
nvkm-y += nvkm/engine/disp/sorgm107.o

nvkm-y += nvkm/engine/disp/sorgm200.o

nvkm-y += nvkm/engine/disp/sorgv100.o

nvkm-y += nvkm/engine/disp/sortu104.o



nvkm-y += nvkm/engine/disp/outp.o

nvkm-y += nvkm/engine/disp/dp.o
@@ -69,6 +71,7 @@ nvkm-y += nvkm/engine/disp/rootgm200.o 
nvkm-y += nvkm/engine/disp/rootgp100.o

nvkm-y += nvkm/engine/disp/rootgp102.o

nvkm-y += nvkm/engine/disp/rootgv100.o

nvkm-y += nvkm/engine/disp/roottu104.o



nvkm-y += nvkm/engine/disp/channv50.o

nvkm-y += nvkm/engine/disp/changf119.o