From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 9 Nov 2016 00:42:47 +0000 (+1000)
Subject: drm/nouveau/devinit/gm200: drop pmu reset sequence
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc2b65592801b80fe8944cb84f635e1725a7bd98;p=linux-beck.git

drm/nouveau/devinit/gm200: drop pmu reset sequence

This sequence is incorrect for GP102/GP104 boards.  This is now being
handled correctly by the PMU subdev during preinit();

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
index d749278b4332..42d94731655a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
@@ -124,18 +124,6 @@ gm200_devinit_post(struct nvkm_devinit *base, bool post)
 		return -EINVAL;
 	}
 
-	/* reset PMU and load init table parser ucode */
-	if (post) {
-		nvkm_mask(device, 0x000200, 0x00002000, 0x00000000);
-		nvkm_mask(device, 0x000200, 0x00002000, 0x00002000);
-		nvkm_rd32(device, 0x000200);
-		if (nvkm_msec(device, 2000,
-			if (!(nvkm_rd32(device, 0x10a10c) & 0x00000006))
-				break;
-		) < 0)
-			return -ETIMEDOUT;
-	}
-
 	ret = pmu_load(init, 0x04, post, &exec, &args);
 	if (ret)
 		return ret;