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

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

drm/nouveau/ce/gp102: rename from gp104 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **); 
int gm107_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

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

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

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

int gp102_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
@@ -4,4 +4,4 @@ nvkm-y += nvkm/engine/ce/gk104.o 
nvkm-y += nvkm/engine/ce/gm107.o

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

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

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

drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c→drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c

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



static const struct nvkm_engine_func

gp104_ce = {

gp102_ce = {

	.intr = gp100_ce_intr,

	.sclass = {

		{ -1, -1, PASCAL_DMA_COPY_B },
@@ -37,8 +37,8 @@ gp104_ce = { 
};



int

gp104_ce_new(struct nvkm_device *device, int index,

gp102_ce_new(struct nvkm_device *device, int index,

	     struct nvkm_engine **pengine)

{

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

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

}

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

+8 −8
Original line number Diff line number Diff line
@@ -2203,10 +2203,10 @@ nv132_chipset = { 
	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = gp104_ce_new,

	.ce[1] = gp104_ce_new,

	.ce[2] = gp104_ce_new,

	.ce[3] = gp104_ce_new,

	.ce[0] = gp102_ce_new,

	.ce[1] = gp102_ce_new,

	.ce[2] = gp102_ce_new,

	.ce[3] = gp102_ce_new,

	.disp = gp104_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,
@@ -2232,10 +2232,10 @@ nv134_chipset = { 
	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = gp104_ce_new,

	.ce[1] = gp104_ce_new,

	.ce[2] = gp104_ce_new,

	.ce[3] = gp104_ce_new,

	.ce[0] = gp102_ce_new,

	.ce[1] = gp102_ce_new,

	.ce[2] = gp102_ce_new,

	.ce[3] = gp102_ce_new,

	.disp = gp104_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,