aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:13 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:25 +1000
commit476901ff6c611620daab3af6cea940be91d97420 (patch)
tree7fa6a6deb4b1e5d20e070c35f08116dc480546e0 /drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
parentb835c09bc6b87318fd06bfcb9ac4bb59eaa48f57 (diff)
drm/nouveau/pm: switch to subdev printk 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.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
index fde6a6013c49..365cd823d6bb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
@@ -126,7 +126,8 @@ 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_subdev *subdev = &pm->engine.subdev;
+ struct nvkm_device *device = subdev->device;
struct nvkm_perfdom *dom = NULL;
struct nvkm_perfsig *sig;
struct nvkm_perfsrc *src;
@@ -153,8 +154,9 @@ nvkm_perfsrc_enable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr)
/* enable the source */
nvkm_mask(device, src->addr, mask, value);
- nv_debug(pm, "enabled source 0x%08x 0x%08x 0x%08x\n",
- src->addr, mask, value);
+ nvkm_debug(subdev,
+ "enabled source %08x %08x %08x\n",
+ src->addr, mask, value);
}
}
return 0;
@@ -163,7 +165,8 @@ 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_subdev *subdev = &pm->engine.subdev;
+ struct nvkm_device *device = subdev->device;
struct nvkm_perfdom *dom = NULL;
struct nvkm_perfsig *sig;
struct nvkm_perfsrc *src;
@@ -189,8 +192,8 @@ nvkm_perfsrc_disable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr)
/* disable the source */
nvkm_mask(device, src->addr, mask, 0);
- nv_debug(pm, "disabled source 0x%08x 0x%08x\n",
- src->addr, mask);
+ nvkm_debug(subdev, "disabled source %08x %08x\n",
+ src->addr, mask);
}
}
return 0;