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

drm/nouveau/gr/gv100-: fix number of tile map registers 



Match RM.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 3ffa6f32

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

+2 −1
Original line number Diff line number Diff line
@@ -113,13 +113,14 @@ void 
gv100_grctx_generate_rop_mapping(struct gf100_gr *gr)

{

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

	const u32 mapregs = DIV_ROUND_UP(gr->func->gpc_nr * gr->func->tpc_nr, 6);

	u32 data;

	int i, j;



	/* Pack tile map into register format. */

	nvkm_wr32(device, 0x418bb8, (gr->tpc_total << 8) |

				     gr->screen_tile_row_offset);

	for (i = 0; i < 11; i++) {

	for (i = 0; i < mapregs; i++) {

		for (data = 0, j = 0; j < 6; j++)

			data |= (gr->tile[i * 6 + j] & 0x1f) << (j * 5);

		nvkm_wr32(device, 0x418b08 + (i * 4), data);

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

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ gv100_gr = { 
	.fecs.reset = gf100_gr_fecs_reset,

	.rops = gm200_gr_rops,

	.gpc_nr = 6,

	.tpc_nr = 5,

	.tpc_nr = 7,

	.ppc_nr = 3,

	.grctx = &gv100_grctx,

	.zbc = &gp102_gr_zbc,