diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-04-08 10:24:40 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-05-20 07:43:04 +0300 |
| commit | 56d06fa29edd58c448766014afd833b7ff51247b (patch) | |
| tree | cb9857812ceeb569aca9fb4c9a9405a5f33feccc /drivers/gpu/drm/nouveau/nvkm/subdev/mc | |
| parent | d85e2a8dd8f0d7592feaecb97ad0b0478f4e2cb7 (diff) | |
| download | linux-56d06fa29edd58c448766014afd833b7ff51247b.tar.xz | |
drm/nouveau/core: remove pmc_enable argument from subdev ctor
These are now specified directly in the MC subdev.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mc')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c index 184325cdc138..350a8caa84c8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c @@ -103,11 +103,6 @@ nvkm_mc_reset_(struct nvkm_mc *mc, enum nvkm_devidx devidx) } } - if (!pmc_enable) { - struct nvkm_subdev *subdev = nvkm_device_subdev(device, devidx); - pmc_enable = subdev->pmc_enable; - } - if (pmc_enable) { nvkm_mask(device, 0x000200, pmc_enable, 0x00000000); nvkm_mask(device, 0x000200, pmc_enable, pmc_enable); @@ -162,7 +157,7 @@ nvkm_mc_new_(const struct nvkm_mc_func *func, struct nvkm_device *device, if (!(mc = *pmc = kzalloc(sizeof(*mc), GFP_KERNEL))) return -ENOMEM; - nvkm_subdev_ctor(&nvkm_mc, device, index, 0, &mc->subdev); + nvkm_subdev_ctor(&nvkm_mc, device, index, &mc->subdev); mc->func = func; return 0; } |