Commit 2fe5ff63 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise init_vsc_stream_master 



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

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

+9 −1
Original line number Diff line number Diff line
@@ -1930,6 +1930,13 @@ gf100_gr_init_gpc_mmu(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x4188b8, nvkm_memory_addr(fb->mmu_rd) >> 8);

}



void

gf100_gr_init_vsc_stream_master(struct gf100_gr *gr)

{

	struct nvkm_device *device = gr->base.engine.subdev.device;

	nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);

}



int

gf100_gr_init(struct gf100_gr *gr)

{
@@ -1956,7 +1963,7 @@ gf100_gr_init(struct gf100_gr *gr) 
	if (gr->func->init_bios)

		gr->func->init_bios(gr);



	nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);

	gr->func->init_vsc_stream_master(gr);



	memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));

	for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
@@ -2068,6 +2075,7 @@ static const struct gf100_gr_func 
gf100_gr = {

	.init = gf100_gr_init,

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.mmio = gf100_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,

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

+4 −1
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct gf100_gr_func { 
	void (*init_gpc_mmu)(struct gf100_gr *);

	void (*init_r405a14)(struct gf100_gr *);

	void (*init_bios)(struct gf100_gr *);

	void (*init_vsc_stream_master)(struct gf100_gr *);

	void (*init_rop_active_fbps)(struct gf100_gr *);

	void (*init_ppc_exceptions)(struct gf100_gr *);

	void (*init_swdx_pes_mask)(struct gf100_gr *);
@@ -143,10 +144,12 @@ struct gf100_gr_func { 
	struct nvkm_sclass sclass[];

};



int gf100_gr_init(struct gf100_gr *);

int gf100_gr_rops(struct gf100_gr *);

int gf100_gr_init(struct gf100_gr *);

void gf100_gr_init_vsc_stream_master(struct gf100_gr *);



int gk104_gr_init(struct gf100_gr *);

void gk104_gr_init_vsc_stream_master(struct gf100_gr *);

void gk104_gr_init_rop_active_fbps(struct gf100_gr *);

void gk104_gr_init_ppc_exceptions(struct gf100_gr *);

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

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static const struct gf100_gr_func 
gf104_gr = {

	.init = gf100_gr_init,

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.mmio = gf104_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ gf108_gr = { 
	.init = gf100_gr_init,

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_r405a14 = gf108_gr_init_r405a14,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.mmio = gf108_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static const struct gf100_gr_func 
gf110_gr = {

	.init = gf100_gr_init,

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,