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

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

drm/nouveau/disp/gp102: rename from gp104 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define GM107_DISP                                    /* cl5070.h */ 0x00009470

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

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

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

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



#define NV31_MPEG                                                    0x00003174

#define G82_MPEG                                                     0x00008274
@@ -90,7 +90,7 @@ 
#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 GP104_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000987d

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



#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 −1
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ 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 **);

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

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

#endif

drivers/gpu/drm/nouveau/nouveau_display.c

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


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

		static const u16 oclass[] = {

			GP104_DISP,

			GP102_DISP,

			GP100_DISP,

			GM200_DISP,

			GM107_DISP,

drivers/gpu/drm/nouveau/nv50_display.c

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

	};

	static const s32 oclass[] = {

		GP104_DISP_CORE_CHANNEL_DMA,

		GP102_DISP_CORE_CHANNEL_DMA,

		GP100_DISP_CORE_CHANNEL_DMA,

		GM200_DISP_CORE_CHANNEL_DMA,

		GM107_DISP_CORE_CHANNEL_DMA,

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

+2 −2
Original line number Diff line number Diff line
@@ -2207,7 +2207,7 @@ nv132_chipset = { 
	.ce[1] = gp102_ce_new,

	.ce[2] = gp102_ce_new,

	.ce[3] = gp102_ce_new,

	.disp = gp104_disp_new,

	.disp = gp102_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,

};
@@ -2236,7 +2236,7 @@ nv134_chipset = { 
	.ce[1] = gp102_ce_new,

	.ce[2] = gp102_ce_new,

	.ce[3] = gp102_ce_new,

	.disp = gp104_disp_new,

	.disp = gp102_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,

};