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

drm/nouveau/gr/gf100-: update r408840 where required 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **); 
int gm20b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp104_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp107_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp10b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -2256,7 +2256,7 @@ nv134_chipset = { 
	.disp = gp102_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,

	.gr = gp102_gr_new,

	.gr = gp104_gr_new,

	.nvdec = gp102_nvdec_new,

	.sec2 = gp102_sec2_new,

	.sw = gf100_sw_new,
@@ -2292,7 +2292,7 @@ nv136_chipset = { 
	.disp = gp102_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,

	.gr = gp102_gr_new,

	.gr = gp104_gr_new,

	.nvdec = gp102_nvdec_new,

	.sec2 = gp102_sec2_new,

	.sw = gf100_sw_new,

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

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ nvkm-y += nvkm/engine/gr/gm200.o 
nvkm-y += nvkm/engine/gr/gm20b.o

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

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

nvkm-y += nvkm/engine/gr/gp104.o

nvkm-y += nvkm/engine/gr/gp107.o

nvkm-y += nvkm/engine/gr/gp10b.o
@@ -54,4 +55,5 @@ nvkm-y += nvkm/engine/gr/ctxgm200.o 
nvkm-y += nvkm/engine/gr/ctxgm20b.o

nvkm-y += nvkm/engine/gr/ctxgp100.o

nvkm-y += nvkm/engine/gr/ctxgp102.o

nvkm-y += nvkm/engine/gr/ctxgp104.o

nvkm-y += nvkm/engine/gr/ctxgp107.o

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c

+2 −0
Original line number Diff line number Diff line
@@ -1436,6 +1436,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
		grctx->r418e94(gr);

	if (grctx->r419a3c)

		grctx->r419a3c(gr);

	if (grctx->r408840)

		grctx->r408840(gr);

}



#define CB_RESERVED 0x80000

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct gf100_grctx_func { 
	void (*r419e00)(struct gf100_gr *);

	void (*r418e94)(struct gf100_gr *);

	void (*r419a3c)(struct gf100_gr *);

	void (*r408840)(struct gf100_gr *);

};



extern const struct gf100_grctx_func gf100_grctx;
@@ -143,6 +144,8 @@ void gp100_grctx_generate_smid_config(struct gf100_gr *); 
extern const struct gf100_grctx_func gp102_grctx;

void gp102_grctx_generate_attrib(struct gf100_grctx *);



extern const struct gf100_grctx_func gp104_grctx;



extern const struct gf100_grctx_func gp107_grctx;



/* context init value lists */