drm/nouveau/pm: switch to subdev printk macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
index fde6a6013c491d5169915de23d6648d08cff18e1..365cd823d6bb20d969f45094277ef6d8fd118053 100644 (file)
--- 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;