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 d749278b43324f802ec2b7946ca4f0e77c233494..42d94731655a47d1b2ce4ac7679ee60b8929a831 100644 (file)
--- 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;