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

Commit f9d5cbb3 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/gp100: initial support 



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

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#define GK110_DISP                                    /* cl5070.h */ 0x00009270

#define GM107_DISP                                    /* cl5070.h */ 0x00009470

#define GM200_DISP                                    /* cl5070.h */ 0x00009570

#define GP100_DISP                                    /* cl5070.h */ 0x00009770



#define NV31_MPEG                                                    0x00003174

#define G82_MPEG                                                     0x00008274
@@ -86,6 +87,7 @@ 
#define GK110_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000927d

#define GM107_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000947d

#define GM200_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000957d

#define GP100_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000977d



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

#define G82_DISP_OVERLAY_CHANNEL_DMA                  /* cl507e.h */ 0x0000827e

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

+1 −0
Original line number Diff line number Diff line
@@ -32,4 +32,5 @@ int gk104_disp_new(struct nvkm_device *, int, struct nvkm_disp **); 
int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

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

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

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

#endif

drivers/gpu/drm/nouveau/nouveau_display.c

+1 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ nouveau_display_create(struct drm_device *dev) 


	if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {

		static const u16 oclass[] = {

			GP100_DISP,

			GM200_DISP,

			GM107_DISP,

			GK110_DISP,

drivers/gpu/drm/nouveau/nv50_display.c

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ nv50_core_create(struct nvif_device *device, struct nvif_object *disp, 
		.pushbuf = 0xb0007d00,

	};

	static const s32 oclass[] = {

		GP100_DISP_CORE_CHANNEL_DMA,

		GM200_DISP_CORE_CHANNEL_DMA,

		GM107_DISP_CORE_CHANNEL_DMA,

		GK110_DISP_CORE_CHANNEL_DMA,

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

+1 −0
Original line number Diff line number Diff line
@@ -2169,6 +2169,7 @@ nv130_chipset = { 
	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.dma = gf119_dma_new,

	.disp = gp100_disp_new,

};



static int