diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:25 +1000 |
| commit | b835c09bc6b87318fd06bfcb9ac4bb59eaa48f57 (patch) | |
| tree | 9fe6fbe51b9b8299baae71e8327293d2cc85545f /drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c | |
| parent | 109c2f2f1c42c16a4b265e796dee6ae4ada78417 (diff) | |
drm/nouveau/mpeg: switch to subdev printk macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c index 586ff06705ba..0a4ada7b3a27 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c @@ -135,8 +135,8 @@ nv50_mpeg_intr(struct nvkm_subdev *subdev) } if (show) { - nv_info(mpeg, "0x%08x 0x%08x 0x%08x 0x%08x\n", - stat, type, mthd, data); + nvkm_info(subdev, "%08x %08x %08x %08x\n", + stat, type, mthd, data); } nvkm_wr32(device, 0x00b100, stat); @@ -146,15 +146,14 @@ nv50_mpeg_intr(struct nvkm_subdev *subdev) static void nv50_vpe_intr(struct nvkm_subdev *subdev) { - struct nvkm_mpeg *mpeg = (void *)subdev; - struct nvkm_device *device = mpeg->engine.subdev.device; + struct nvkm_device *device = subdev->device; if (nvkm_rd32(device, 0x00b100)) nv50_mpeg_intr(subdev); if (nvkm_rd32(device, 0x00b800)) { u32 stat = nvkm_rd32(device, 0x00b800); - nv_info(mpeg, "PMSRCH: 0x%08x\n", stat); + nvkm_info(subdev, "PMSRCH: %08x\n", stat); nvkm_wr32(device, 0xb800, stat); } } @@ -183,7 +182,8 @@ int nv50_mpeg_init(struct nvkm_object *object) { struct nvkm_mpeg *mpeg = (void *)object; - struct nvkm_device *device = mpeg->engine.subdev.device; + struct nvkm_subdev *subdev = &mpeg->engine.subdev; + struct nvkm_device *device = subdev->device; int ret; ret = nvkm_mpeg_init(mpeg); @@ -208,7 +208,8 @@ nv50_mpeg_init(struct nvkm_object *object) if (!(nvkm_rd32(device, 0x00b200) & 0x00000001)) break; ) < 0) { - nv_error(mpeg, "timeout 0x%08x\n", nvkm_rd32(device, 0x00b200)); + nvkm_error(subdev, "timeout %08x\n", + nvkm_rd32(device, 0x00b200)); return -EBUSY; } |