Commit 02917aa3 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise init_zcull 



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

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

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

}



void

gf100_gr_init_zcull(struct gf100_gr *gr)

{

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

	const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);

	u32 data[TPC_MAX / 8] = {};

	u8  tpcnr[GPC_MAX];

	int gpc, tpc;

	int i;



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

	for (i = 0, gpc = -1; i < gr->tpc_total; i++) {

		do {

			gpc = (gpc + 1) % gr->gpc_nr;

		} while (!tpcnr[gpc]);

		tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;



		data[i / 8] |= tpc << ((i % 8) * 4);

	}



	nvkm_wr32(device, GPC_BCAST(0x0980), data[0]);

	nvkm_wr32(device, GPC_BCAST(0x0984), data[1]);

	nvkm_wr32(device, GPC_BCAST(0x0988), data[2]);

	nvkm_wr32(device, GPC_BCAST(0x098c), data[3]);



	nvkm_wr32(device, GPC_BCAST(0x1bd4), magicgpc918);

}



void

gf100_gr_init_vsc_stream_master(struct gf100_gr *gr)

{
@@ -1941,11 +1969,7 @@ int 
gf100_gr_init(struct gf100_gr *gr)

{

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

	const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);

	u32 data[TPC_MAX / 8] = {};

	u8  tpcnr[GPC_MAX];

	int gpc, tpc, rop;

	int i;



	gr->func->init_gpc_mmu(gr);
@@ -1964,34 +1988,7 @@ gf100_gr_init(struct gf100_gr *gr) 
		gr->func->init_bios(gr);



	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++) {

		do {

			gpc = (gpc + 1) % gr->gpc_nr;

		} while (!tpcnr[gpc]);

		tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;



		data[i / 8] |= tpc << ((i % 8) * 4);

	}



	nvkm_wr32(device, GPC_BCAST(0x0980), data[0]);

	nvkm_wr32(device, GPC_BCAST(0x0984), data[1]);

	nvkm_wr32(device, GPC_BCAST(0x0988), data[2]);

	nvkm_wr32(device, GPC_BCAST(0x098c), data[3]);



	for (gpc = 0; gpc < gr->gpc_nr; gpc++) {

		nvkm_wr32(device, GPC_UNIT(gpc, 0x0914),

			  gr->screen_tile_row_offset << 8 | gr->tpc_nr[gpc]);

		nvkm_wr32(device, GPC_UNIT(gpc, 0x0910), 0x00040000 |

							 gr->tpc_total);

		nvkm_wr32(device, GPC_UNIT(gpc, 0x0918), magicgpc918);

	}



	if (device->chipset != 0xd7)

		nvkm_wr32(device, GPC_BCAST(0x1bd4), magicgpc918);

	else

		nvkm_wr32(device, GPC_BCAST(0x3fd4), magicgpc918);

	gr->func->init_zcull(gr);



	nvkm_wr32(device, GPC_BCAST(0x08ac), nvkm_rd32(device, 0x100800));
@@ -2076,6 +2073,7 @@ gf100_gr = { 
	.init = gf100_gr_init,

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.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 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct gf100_gr_func { 
	void (*init_r405a14)(struct gf100_gr *);

	void (*init_bios)(struct gf100_gr *);

	void (*init_vsc_stream_master)(struct gf100_gr *);

	void (*init_zcull)(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 *);
@@ -147,6 +148,9 @@ struct gf100_gr_func { 
int gf100_gr_rops(struct gf100_gr *);

int gf100_gr_init(struct gf100_gr *);

void gf100_gr_init_vsc_stream_master(struct gf100_gr *);

void gf100_gr_init_zcull(struct gf100_gr *);



void gf117_gr_init_zcull(struct gf100_gr *);



int gk104_gr_init(struct gf100_gr *);

void gk104_gr_init_vsc_stream_master(struct gf100_gr *);

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

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

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.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
@@ -115,6 +115,7 @@ gf108_gr = { 
	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_r405a14 = gf108_gr_init_r405a14,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.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
@@ -89,6 +89,7 @@ gf110_gr = { 
	.init = gf100_gr_init,

	.init_gpc_mmu = gf100_gr_init_gpc_mmu,

	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,