aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-11-08 19:42:47 -0500
committerBen Skeggs <bskeggs@redhat.com>2016-11-16 18:50:37 -0500
commitdc2b65592801b80fe8944cb84f635e1725a7bd98 (patch)
tree62e5da7b1dd4bddcc834bb3a54e9e5dc642c6549
parent920c58a7119bb5d23d21f361a395acb79e693521 (diff)
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>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c12
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)
124 return -EINVAL; 124 return -EINVAL;
125 } 125 }
126 126
127 /* reset PMU and load init table parser ucode */
128 if (post) {
129 nvkm_mask(device, 0x000200, 0x00002000, 0x00000000);
130 nvkm_mask(device, 0x000200, 0x00002000, 0x00002000);
131 nvkm_rd32(device, 0x000200);
132 if (nvkm_msec(device, 2000,
133 if (!(nvkm_rd32(device, 0x10a10c) & 0x00000006))
134 break;
135 ) < 0)
136 return -ETIMEDOUT;
137 }
138
139 ret = pmu_load(init, 0x04, post, &exec, &args); 127 ret = pmu_load(init, 0x04, post, &exec, &args);
140 if (ret) 128 if (ret)
141 return ret; 129 return ret;