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

Commit 19d53d01 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50: fix atomic regression on original G80 



Reported-by: default avatarPierre Moreau <pierre.morrow@free.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b53ac1ee

drivers/gpu/drm/nouveau/nv50_display.c

+5 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,11 @@ nv50_head_core_set(struct nv50_head *head, struct nv50_head_atom *asyh) 
			evo_data(push, asyh->core.handle);

			evo_mthd(push, 0x08c0 + head->base.index * 0x400, 1);

			evo_data(push, (asyh->core.y << 16) | asyh->core.x);

			/* EVO will complain with INVALID_STATE if we have an

			 * active cursor and (re)specify HeadSetContextDmaIso

			 * without also updating HeadSetOffsetCursor.

			 */

			asyh->set.curs = asyh->curs.visible;

		} else

		if (core->base.user.oclass < GF110_DISP_CORE_CHANNEL_DMA) {

			evo_mthd(push, 0x0860 + head->base.index * 0x400, 1);