From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 1 Jun 2022 10:48:10 +0000 (+1000)
Subject: drm/nouveau/gr/gf100-: gpfifo_ctl zero before init
X-Git-Tag: v6.2-rc1~124^2~20^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d7557072414af191cefbaa7c908e1c09f5b7d7b;p=thirdparty%2Flinux.git

drm/nouveau/gr/gf100-: gpfifo_ctl zero before init

Match RM.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index ffdb5c38afee4..17e1c0dfda478 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -2285,6 +2285,8 @@ gf100_gr_init(struct gf100_gr *gr)
 	struct nvkm_device *device = gr->base.engine.subdev.device;
 	int gpc, tpc, rop;
 
+	nvkm_mask(device, 0x400500, 0x00010001, 0x00000000);
+
 	if (gr->func->init_419bd8)
 		gr->func->init_419bd8(gr);