diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 13:47:48 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2022-11-09 03:44:57 +0300 |
| commit | b7f44ef7320a50dd6718df06f8750489c1b1d5ea (patch) | |
| tree | 78717a1c7615608376c1d5bb5c1ac431a79d920a /drivers/gpu/drm/nouveau/nvkm/subdev/pmu | |
| parent | 74f9dcb0df10567c1124b0cece2c6229a8c77cab (diff) | |
| download | linux-b7f44ef7320a50dd6718df06f8750489c1b1d5ea.tar.xz | |
drm/nouveau/pmu: move preinit() falcon reset to devinit
Cleanup before falcon changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/pmu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c index 455e95a89259..e10f46c7e817 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c @@ -99,9 +99,6 @@ nvkm_pmu_reset(struct nvkm_pmu *pmu) { struct nvkm_device *device = pmu->subdev.device; - if (!pmu->func->enabled(pmu)) - return; - /* Reset. */ if (pmu->func->reset) pmu->func->reset(pmu); @@ -114,14 +111,6 @@ nvkm_pmu_reset(struct nvkm_pmu *pmu) } static int -nvkm_pmu_preinit(struct nvkm_subdev *subdev) -{ - struct nvkm_pmu *pmu = nvkm_pmu(subdev); - nvkm_pmu_reset(pmu); - return 0; -} - -static int nvkm_pmu_init(struct nvkm_subdev *subdev) { struct nvkm_pmu *pmu = nvkm_pmu(subdev); @@ -160,7 +149,6 @@ nvkm_pmu_dtor(struct nvkm_subdev *subdev) static const struct nvkm_subdev_func nvkm_pmu = { .dtor = nvkm_pmu_dtor, - .preinit = nvkm_pmu_preinit, .init = nvkm_pmu_init, .fini = nvkm_pmu_fini, .intr = nvkm_pmu_intr, |