diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:19 +1000 |
| commit | 846e831d953fd01cb78b9ed92495baee142bed37 (patch) | |
| tree | 7bbb90855cf5c07e3c1edf833bba50e64c64f6d6 /drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | |
| parent | f2d85ad1a63130ba31434d042b6c76f24f6b9673 (diff) | |
drm/nouveau/pm: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index 6803ad9ebe6f..fde6a6013c49 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -126,6 +126,7 @@ nvkm_perfsrc_find(struct nvkm_pm *pm, struct nvkm_perfsig *sig, int si) static int nvkm_perfsrc_enable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr) { + struct nvkm_device *device = pm->engine.subdev.device; struct nvkm_perfdom *dom = NULL; struct nvkm_perfsig *sig; struct nvkm_perfsrc *src; @@ -151,7 +152,7 @@ nvkm_perfsrc_enable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr) value |= ((ctr->source[i][j] >> 32) << src->shift); /* enable the source */ - nv_mask(pm, src->addr, mask, value); + nvkm_mask(device, src->addr, mask, value); nv_debug(pm, "enabled source 0x%08x 0x%08x 0x%08x\n", src->addr, mask, value); } @@ -162,6 +163,7 @@ nvkm_perfsrc_enable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr) static int nvkm_perfsrc_disable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr) { + struct nvkm_device *device = pm->engine.subdev.device; struct nvkm_perfdom *dom = NULL; struct nvkm_perfsig *sig; struct nvkm_perfsrc *src; @@ -186,7 +188,7 @@ nvkm_perfsrc_disable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr) mask |= (src->mask << src->shift); /* disable the source */ - nv_mask(pm, src->addr, mask, 0); + nvkm_mask(device, src->addr, mask, 0); nv_debug(pm, "disabled source 0x%08x 0x%08x\n", src->addr, mask); } |