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

drm/nouveau/disp/tu102: rename implementation from tu104 



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

drivers/gpu/drm/nouveau/dispnv50/core.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ nv50_core_new(struct nouveau_drm *drm, struct nv50_core **pcore) 
		int version;

		int (*new)(struct nouveau_drm *, s32, struct nv50_core **);

	} cores[] = {

		{ TU104_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ TU102_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ GV100_DISP_CORE_CHANNEL_DMA, 0, corec37d_new },

		{ GP102_DISP_CORE_CHANNEL_DMA, 0, core917d_new },

		{ GP100_DISP_CORE_CHANNEL_DMA, 0, core917d_new },

drivers/gpu/drm/nouveau/dispnv50/curs.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ nv50_curs_new(struct nouveau_drm *drm, int head, struct nv50_wndw **pwndw) 
		int version;

		int (*new)(struct nouveau_drm *, int, s32, struct nv50_wndw **);

	} curses[] = {

		{ TU104_DISP_CURSOR, 0, cursc37a_new },

		{ TU102_DISP_CURSOR, 0, cursc37a_new },

		{ GV100_DISP_CURSOR, 0, cursc37a_new },

		{ GK104_DISP_CURSOR, 0, curs907a_new },

		{ GF110_DISP_CURSOR, 0, curs907a_new },

drivers/gpu/drm/nouveau/dispnv50/wimm.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ nv50_wimm_init(struct nouveau_drm *drm, struct nv50_wndw *wndw) 
		int version;

		int (*init)(struct nouveau_drm *, s32, struct nv50_wndw *);

	} wimms[] = {

		{ TU104_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init },

		{ TU102_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init },

		{ GV100_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init },

		{}

	};

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ nv50_wndw_new(struct nouveau_drm *drm, enum drm_plane_type type, int index, 
		int (*new)(struct nouveau_drm *, enum drm_plane_type,

			   int, s32, struct nv50_wndw **);

	} wndws[] = {

		{ TU104_DISP_WINDOW_CHANNEL_DMA, 0, wndwc57e_new },

		{ TU102_DISP_WINDOW_CHANNEL_DMA, 0, wndwc57e_new },

		{ GV100_DISP_WINDOW_CHANNEL_DMA, 0, wndwc37e_new },

		{}

	};

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

+5 −5
Original line number Diff line number Diff line
@@ -84,7 +84,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 TU102_DISP                                    /* cl5070.h */ 0x0000c570



#define NV31_MPEG                                                    0x00003174

#define G82_MPEG                                                     0x00008274
@@ -97,7 +97,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 TU102_DISP_CURSOR                             /* cl507a.h */ 0x0000c57a



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

#define G82_DISP_OVERLAY                              /* cl507b.h */ 0x0000827b
@@ -106,7 +106,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 TU102_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
@@ -129,7 +129,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 TU102_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
@@ -139,7 +139,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 TU102_DISP_WINDOW_CHANNEL_DMA                 /* clc37e.h */ 0x0000c57e



#define NV50_TESLA                                                   0x00005097

#define G82_TESLA                                                    0x00008297