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

drm/nouveau/gr/gp108: split from gp107 



ACR LS FW loading is moving out of SECBOOT and into their specific subdevs,
and the available GP107/GP108 FWs have interface differences.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 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 gp108_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

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

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

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -2374,7 +2374,7 @@ nv138_chipset = { 
	.disp = gp102_disp_new,

	.dma = gf119_dma_new,

	.fifo = gp100_fifo_new,

	.gr = gp107_gr_new,

	.gr = gp108_gr_new,

	.nvdec[0] = gp102_nvdec_new,

	.sec2 = gp102_sec2_new,

	.sw = gf100_sw_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 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/gp108.o

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ void gp100_gr_zbc_clear_depth(struct gf100_gr *, int); 
void gp102_gr_init_swdx_pes_mask(struct gf100_gr *);

extern const struct gf100_gr_func_zbc gp102_gr_zbc;



extern const struct gf100_gr_func gp107_gr;



int gk20a_gr_load_sw(struct gf100_gr *, const char *path, int ver);



#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include <nvif/class.h>



static const struct gf100_gr_func

const struct gf100_gr_func

gp107_gr = {

	.oneinit_tiles = gm200_gr_oneinit_tiles,

	.oneinit_sm_id = gm200_gr_oneinit_sm_id,

CRA Git | Maintained and supported by SUSTech CRA and CCSE