Commit 404ba3f7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100: fix some accidental or'ing of buffer addresses 



fdo#83992

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

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

+2 −2
Original line number Diff line number Diff line
@@ -1032,9 +1032,9 @@ gf100_grctx_generate_bundle(struct gf100_grctx *info) 
	const int s = 8;

	const int b = mmio_vram(info, impl->bundle_size, (1 << s), access);

	mmio_refn(info, 0x408004, 0x00000000, s, b);

	mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b);

	mmio_wr32(info, 0x408008, 0x80000000 | (impl->bundle_size >> s));

	mmio_refn(info, 0x418808, 0x00000000, s, b);

	mmio_refn(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s), 0, b);

	mmio_wr32(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s));

}



void

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

+2 −2
Original line number Diff line number Diff line
@@ -851,9 +851,9 @@ gk104_grctx_generate_bundle(struct gf100_grctx *info) 
	const int s = 8;

	const int b = mmio_vram(info, impl->bundle_size, (1 << s), access);

	mmio_refn(info, 0x408004, 0x00000000, s, b);

	mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b);

	mmio_wr32(info, 0x408008, 0x80000000 | (impl->bundle_size >> s));

	mmio_refn(info, 0x418808, 0x00000000, s, b);

	mmio_refn(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s), 0, b);

	mmio_wr32(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s));

	mmio_wr32(info, 0x4064c8, (state_limit << 16) | token_limit);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -871,9 +871,9 @@ gm107_grctx_generate_bundle(struct gf100_grctx *info) 
	const int s = 8;

	const int b = mmio_vram(info, impl->bundle_size, (1 << s), access);

	mmio_refn(info, 0x408004, 0x00000000, s, b);

	mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b);

	mmio_wr32(info, 0x408008, 0x80000000 | (impl->bundle_size >> s));

	mmio_refn(info, 0x418e24, 0x00000000, s, b);

	mmio_refn(info, 0x418e28, 0x80000000 | (impl->bundle_size >> s), 0, b);

	mmio_wr32(info, 0x418e28, 0x80000000 | (impl->bundle_size >> s));

	mmio_wr32(info, 0x4064c8, (state_limit << 16) | token_limit);

}