Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e62ef6 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup 

This should fix some unaligned access warnings. This is also likely to
fix non-descript issues on nv30/nv34 as a result of incorrect channel
setup.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96836


Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 692a17dc

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

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ nv30_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch, 
		nvkm_wo32(chan->inst, i, 0x00040004);

	for (i = 0x1f18; i <= 0x3088 ; i += 16) {

		nvkm_wo32(chan->inst, i + 0, 0x10700ff9);

		nvkm_wo32(chan->inst, i + 1, 0x0436086c);

		nvkm_wo32(chan->inst, i + 2, 0x000c001b);

		nvkm_wo32(chan->inst, i + 4, 0x0436086c);

		nvkm_wo32(chan->inst, i + 8, 0x000c001b);

	}

	for (i = 0x30b8; i < 0x30c8; i += 4)

		nvkm_wo32(chan->inst, i, 0x0000ffff);

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

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ nv34_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch, 
		nvkm_wo32(chan->inst, i, 0x00040004);

	for (i = 0x15ac; i <= 0x271c ; i += 16) {

		nvkm_wo32(chan->inst, i + 0, 0x10700ff9);

		nvkm_wo32(chan->inst, i + 1, 0x0436086c);

		nvkm_wo32(chan->inst, i + 2, 0x000c001b);

		nvkm_wo32(chan->inst, i + 4, 0x0436086c);

		nvkm_wo32(chan->inst, i + 8, 0x000c001b);

	}

	for (i = 0x274c; i < 0x275c; i += 4)

		nvkm_wo32(chan->inst, i, 0x0000ffff);