From b835c09bc6b87318fd06bfcb9ac4bb59eaa48f57 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:13 +1000 Subject: [PATCH] drm/nouveau/mpeg: switch to subdev printk macros Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 12 +++++++----- drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 10 +++++----- drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c | 15 ++++++++------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c index 4ea554e81a29..4ece5c065412 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c @@ -229,9 +229,9 @@ nv31_mpeg_intr(struct nvkm_subdev *subdev) nvkm_wr32(device, 0x00b230, 0x00000001); if (show) { - nv_error(mpeg, "ch %d [%s] 0x%08x 0x%08x 0x%08x 0x%08x\n", - fifo->chid(fifo, engctx), - nvkm_client_name(engctx), stat, type, mthd, data); + nvkm_error(subdev, "ch %d [%s] %08x %08x %08x %08x\n", + fifo->chid(fifo, engctx), + nvkm_client_name(engctx), stat, type, mthd, data); } spin_unlock_irqrestore(&nv_engine(mpeg)->lock, flags); @@ -263,7 +263,8 @@ nv31_mpeg_init(struct nvkm_object *object) { struct nvkm_engine *engine = nv_engine(object); struct nv31_mpeg *mpeg = (void *)object; - struct nvkm_device *device = mpeg->base.engine.subdev.device; + struct nvkm_subdev *subdev = &mpeg->base.engine.subdev; + struct nvkm_device *device = subdev->device; struct nvkm_fb *fb = device->fb; int ret, i; @@ -292,7 +293,8 @@ nv31_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; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c index 08da34bf7931..47ae1d890a7f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c @@ -98,7 +98,7 @@ nv40_mpeg_intr(struct nvkm_subdev *subdev) nv31_mpeg_intr(subdev); if ((stat = nvkm_rd32(device, 0x00b800))) { - nv_error(mpeg, "PMSRCH 0x%08x\n", stat); + nvkm_error(subdev, "PMSRCH %08x\n", stat); nvkm_wr32(device, 0x00b800, stat); } } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c index cbf98b306d71..9bd5fc185ea2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c @@ -126,10 +126,10 @@ nv44_mpeg_intr(struct nvkm_subdev *subdev) nvkm_wr32(device, 0x00b230, 0x00000001); if (show) { - nv_error(mpeg, - "ch %d [0x%08x %s] 0x%08x 0x%08x 0x%08x 0x%08x\n", - chid, inst << 4, nvkm_client_name(engctx), stat, - type, mthd, data); + nvkm_error(subdev, + "ch %d [%08x %s] %08x %08x %08x %08x\n", + chid, inst << 4, nvkm_client_name(engctx), stat, + type, mthd, data); } nvkm_engctx_put(engctx); @@ -146,7 +146,7 @@ nv44_mpeg_me_intr(struct nvkm_subdev *subdev) nv44_mpeg_intr(subdev); if ((stat = nvkm_rd32(device, 0x00b800))) { - nv_error(mpeg, "PMSRCH 0x%08x\n", stat); + nvkm_error(subdev, "PMSRCH %08x\n", stat); nvkm_wr32(device, 0x00b800, stat); } } 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; } -- 2.39.5