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

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -74,5 +74,5 @@ int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **); 
int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp10b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gv100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int tu104_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int tu102_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -2463,7 +2463,7 @@ nv162_chipset = { 
	.ce[4] = tu104_ce_new,

	.disp = tu102_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu104_fifo_new,

	.fifo = tu102_fifo_new,

};



static const struct nvkm_device_chip
@@ -2495,7 +2495,7 @@ nv164_chipset = { 
	.ce[4] = tu104_ce_new,

	.disp = tu102_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu104_fifo_new,

	.fifo = tu102_fifo_new,

};



static const struct nvkm_device_chip
@@ -2527,7 +2527,7 @@ nv166_chipset = { 
	.ce[4] = tu104_ce_new,

	.disp = tu102_disp_new,

	.dma = gv100_dma_new,

	.fifo = tu104_fifo_new,

	.fifo = tu102_fifo_new,

};



static int

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ nvkm-y += nvkm/engine/fifo/gm20b.o 
nvkm-y += nvkm/engine/fifo/gp100.o

nvkm-y += nvkm/engine/fifo/gp10b.o

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

nvkm-y += nvkm/engine/fifo/tu104.o

nvkm-y += nvkm/engine/fifo/tu102.o



nvkm-y += nvkm/engine/fifo/chan.o

nvkm-y += nvkm/engine/fifo/channv50.o
@@ -34,7 +34,7 @@ nvkm-y += nvkm/engine/fifo/gpfifog84.o 
nvkm-y += nvkm/engine/fifo/gpfifogf100.o

nvkm-y += nvkm/engine/fifo/gpfifogk104.o

nvkm-y += nvkm/engine/fifo/gpfifogv100.o

nvkm-y += nvkm/engine/fifo/gpfifotu104.o

nvkm-y += nvkm/engine/fifo/gpfifotu102.o



nvkm-y += nvkm/engine/fifo/usergv100.o

nvkm-y += nvkm/engine/fifo/usertu104.o
 
nvkm-y += nvkm/engine/fifo/usertu102.o

drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h

+1 −1
Original line number Diff line number Diff line
@@ -47,6 +47,6 @@ int gv100_fifo_gpfifo_engine_init(struct nvkm_fifo_chan *, 
int gv100_fifo_gpfifo_engine_fini(struct nvkm_fifo_chan *,

				  struct nvkm_engine *, bool);



int tu104_fifo_gpfifo_new(struct gk104_fifo *, const struct nvkm_oclass *,

int tu102_fifo_gpfifo_new(struct gk104_fifo *, const struct nvkm_oclass *,

			  void *data, u32 size, struct nvkm_object **);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifotu104.c→drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifotu102.c

+5 −5
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ 
#include <nvif/unpack.h>



static u32

tu104_fifo_gpfifo_submit_token(struct nvkm_fifo_chan *base)

tu102_fifo_gpfifo_submit_token(struct nvkm_fifo_chan *base)

{

	struct gk104_fifo_chan *chan = gk104_fifo_chan(base);

	return (chan->runl << 16) | chan->base.chid;

}



static const struct nvkm_fifo_chan_func

tu104_fifo_gpfifo = {

tu102_fifo_gpfifo = {

	.dtor = gk104_fifo_gpfifo_dtor,

	.init = gk104_fifo_gpfifo_init,

	.fini = gk104_fifo_gpfifo_fini,
@@ -45,11 +45,11 @@ tu104_fifo_gpfifo = { 
	.engine_dtor = gk104_fifo_gpfifo_engine_dtor,

	.engine_init = gv100_fifo_gpfifo_engine_init,

	.engine_fini = gv100_fifo_gpfifo_engine_fini,

	.submit_token = tu104_fifo_gpfifo_submit_token,

	.submit_token = tu102_fifo_gpfifo_submit_token,

};



int

tu104_fifo_gpfifo_new(struct gk104_fifo *fifo, const struct nvkm_oclass *oclass,

tu102_fifo_gpfifo_new(struct gk104_fifo *fifo, const struct nvkm_oclass *oclass,

		      void *data, u32 size, struct nvkm_object **pobject)

{

	struct nvkm_object *parent = oclass->parent;
@@ -67,7 +67,7 @@ tu104_fifo_gpfifo_new(struct gk104_fifo *fifo, const struct nvkm_oclass *oclass, 
			   args->v0.ilength, args->v0.runlist, args->v0.priv);

		if (args->v0.priv && !oclass->client->super)

			return -EINVAL;

		return gv100_fifo_gpfifo_new_(&tu104_fifo_gpfifo, fifo,

		return gv100_fifo_gpfifo_new_(&tu102_fifo_gpfifo, fifo,

					      &args->v0.runlist,

					      &args->v0.chid,

					       args->v0.vmm,