Skip to content

Commit

Permalink
drm/nouveau/devinit/gm200: drop pmu reset sequence
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ben Skeggs committed Nov 16, 2016
1 parent 920c58a commit dc2b655
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit dc2b655

Please sign in to comment.