diff options
| author | Ben Skeggs | 2016-11-09 01:42:47 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2016-11-17 00:50:37 +0100 |
| commit | dc2b65592801b80fe8944cb84f635e1725a7bd98 (patch) | |
| tree | 62e5da7b1dd4bddcc834bb3a54e9e5dc642c6549 /drivers/gpu/drm/nouveau/nvkm/subdev/devinit | |
| parent | drm/nouveau/devinit/gm200: replace while loops with PTIMER-based timeout loops (diff) | |
| download | kernel-qcow2-linux-dc2b65592801b80fe8944cb84f635e1725a7bd98.tar.gz kernel-qcow2-linux-dc2b65592801b80fe8944cb84f635e1725a7bd98.tar.xz kernel-qcow2-linux-dc2b65592801b80fe8944cb84f635e1725a7bd98.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c | 12 |
1 files changed, 0 insertions, 12 deletions
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; |