From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 12 Feb 2019 12:28:13 +0000 (+1000)
Subject: drm/nouveau/gr/gf100-: remove some unnecessary reg writes
X-Git-Tag: v5.1-rc1~117^2~6^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c7db7684448c51a406d07461aa74d436fba5b3e;p=thirdparty%2Fkernel%2Flinux.git

drm/nouveau/gr/gf100-: remove some unnecessary reg writes

This is already done during golden context creation.

Signed-off-by: Ben Skeggs <bskeggs@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 47469f4591d55..5ab6468b25f46 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1684,12 +1684,7 @@ gf100_gr_init_ctxctl_ext(struct gf100_gr *gr)
 			return ret;
 	}
 
-	if (device->chipset >= 0xe0) {
-		nvkm_wr32(device, 0x409614, 0x00000070);
-		nvkm_wr32(device, 0x409614, 0x00000770);
-		nvkm_wr32(device, 0x40802c, 0x00000001);
-	}
-
+	/* Generate golden context image. */
 	if (gr->data == NULL) {
 		int ret = gf100_grctx_generate(gr);
 		if (ret) {