From 2f66a1e3a19ddca2789f68178245605c27522546 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 9 Nov 2016 10:42:47 +1000 Subject: 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 --- drm/nouveau/nvkm/subdev/devinit/gm200.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'drm') diff --git a/drm/nouveau/nvkm/subdev/devinit/gm200.c b/drm/nouveau/nvkm/subdev/devinit/gm200.c index d749278b4..42d947316 100644 --- a/drm/nouveau/nvkm/subdev/devinit/gm200.c +++ b/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; -- cgit v1.2.1