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

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **); 
int gp100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp102_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gv100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int tu104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int tu102_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ nvkm-y += nvkm/engine/ce/gm200.o 
nvkm-y += nvkm/engine/ce/gp100.o

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

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

nvkm-y += nvkm/engine/ce/tu104.o
 
nvkm-y += nvkm/engine/ce/tu102.o

drivers/gpu/drm/nouveau/nvkm/engine/ce/tu104.c→drivers/gpu/drm/nouveau/nvkm/engine/ce/tu102.c

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <nvif/class.h>



static const struct nvkm_engine_func

tu104_ce = {

tu102_ce = {

	.intr = gp100_ce_intr,

	.sclass = {

		{ -1, -1, TURING_DMA_COPY_A },
@@ -33,8 +33,8 @@ tu104_ce = { 
};



int

tu104_ce_new(struct nvkm_device *device, int index,

tu102_ce_new(struct nvkm_device *device, int index,

	     struct nvkm_engine **pengine)

{

	return nvkm_engine_new_(&tu104_ce, device, index, true, pengine);

	return nvkm_engine_new_(&tu102_ce, device, index, true, pengine);

}

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

+15 −15
Original line number Diff line number Diff line
@@ -2456,11 +2456,11 @@ nv162_chipset = { 
	.therm = gp100_therm_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = tu104_ce_new,

	.ce[1] = tu104_ce_new,

	.ce[2] = tu104_ce_new,

	.ce[3] = tu104_ce_new,

	.ce[4] = tu104_ce_new,

	.ce[0] = tu102_ce_new,

	.ce[1] = tu102_ce_new,

	.ce[2] = tu102_ce_new,

	.ce[3] = tu102_ce_new,

	.ce[4] = tu102_ce_new,

	.disp = tu102_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu102_fifo_new,
@@ -2488,11 +2488,11 @@ nv164_chipset = { 
	.therm = gp100_therm_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = tu104_ce_new,

	.ce[1] = tu104_ce_new,

	.ce[2] = tu104_ce_new,

	.ce[3] = tu104_ce_new,

	.ce[4] = tu104_ce_new,

	.ce[0] = tu102_ce_new,

	.ce[1] = tu102_ce_new,

	.ce[2] = tu102_ce_new,

	.ce[3] = tu102_ce_new,

	.ce[4] = tu102_ce_new,

	.disp = tu102_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu102_fifo_new,
@@ -2520,11 +2520,11 @@ nv166_chipset = { 
	.therm = gp100_therm_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = tu104_ce_new,

	.ce[1] = tu104_ce_new,

	.ce[2] = tu104_ce_new,

	.ce[3] = tu104_ce_new,

	.ce[4] = tu104_ce_new,

	.ce[0] = tu102_ce_new,

	.ce[1] = tu102_ce_new,

	.ce[2] = tu102_ce_new,

	.ce[3] = tu102_ce_new,

	.ce[4] = tu102_ce_new,

	.disp = tu102_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu102_fifo_new,