From 18019e95de4ffdfb020d61197b8da2af1a442c8e Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:12 +1000 Subject: [PATCH] drm/nouveau/ibus: switch to subdev printk macros Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c | 15 +++++++++------ drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c | 15 +++++++++------ drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c index 5f7652942b2a..6708fbafebae 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c @@ -26,33 +26,36 @@ static void gf100_ibus_intr_hub(struct nvkm_ibus *ibus, int i) { - struct nvkm_device *device = ibus->subdev.device; + struct nvkm_subdev *subdev = &ibus->subdev; + struct nvkm_device *device = subdev->device; u32 addr = nvkm_rd32(device, 0x122120 + (i * 0x0400)); u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0400)); u32 stat = nvkm_rd32(device, 0x122128 + (i * 0x0400)); - nv_error(ibus, "HUB%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat); + nvkm_error(subdev, "HUB%d: %06x %08x (%08x)\n", i, addr, data, stat); nvkm_mask(device, 0x122128 + (i * 0x0400), 0x00000200, 0x00000000); } static void gf100_ibus_intr_rop(struct nvkm_ibus *ibus, int i) { - struct nvkm_device *device = ibus->subdev.device; + struct nvkm_subdev *subdev = &ibus->subdev; + struct nvkm_device *device = subdev->device; u32 addr = nvkm_rd32(device, 0x124120 + (i * 0x0400)); u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0400)); u32 stat = nvkm_rd32(device, 0x124128 + (i * 0x0400)); - nv_error(ibus, "ROP%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat); + nvkm_error(subdev, "ROP%d: %06x %08x (%08x)\n", i, addr, data, stat); nvkm_mask(device, 0x124128 + (i * 0x0400), 0x00000200, 0x00000000); } static void gf100_ibus_intr_gpc(struct nvkm_ibus *ibus, int i) { - struct nvkm_device *device = ibus->subdev.device; + struct nvkm_subdev *subdev = &ibus->subdev; + struct nvkm_device *device = subdev->device; u32 addr = nvkm_rd32(device, 0x128120 + (i * 0x0400)); u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0400)); u32 stat = nvkm_rd32(device, 0x128128 + (i * 0x0400)); - nv_error(ibus, "GPC%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat); + nvkm_error(subdev, "GPC%d: %06x %08x (%08x)\n", i, addr, data, stat); nvkm_mask(device, 0x128128 + (i * 0x0400), 0x00000200, 0x00000000); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c index 53dd1ba389d7..0ac0bbaa9d2a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c @@ -26,33 +26,36 @@ static void gk104_ibus_intr_hub(struct nvkm_ibus *ibus, int i) { - struct nvkm_device *device = ibus->subdev.device; + struct nvkm_subdev *subdev = &ibus->subdev; + struct nvkm_device *device = subdev->device; u32 addr = nvkm_rd32(device, 0x122120 + (i * 0x0800)); u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0800)); u32 stat = nvkm_rd32(device, 0x122128 + (i * 0x0800)); - nv_error(ibus, "HUB%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat); + nvkm_error(subdev, "HUB%d: %06x %08x (%08x)\n", i, addr, data, stat); nvkm_mask(device, 0x122128 + (i * 0x0800), 0x00000200, 0x00000000); } static void gk104_ibus_intr_rop(struct nvkm_ibus *ibus, int i) { - struct nvkm_device *device = ibus->subdev.device; + struct nvkm_subdev *subdev = &ibus->subdev; + struct nvkm_device *device = subdev->device; u32 addr = nvkm_rd32(device, 0x124120 + (i * 0x0800)); u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0800)); u32 stat = nvkm_rd32(device, 0x124128 + (i * 0x0800)); - nv_error(ibus, "ROP%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat); + nvkm_error(subdev, "ROP%d: %06x %08x (%08x)\n", i, addr, data, stat); nvkm_mask(device, 0x124128 + (i * 0x0800), 0x00000200, 0x00000000); } static void gk104_ibus_intr_gpc(struct nvkm_ibus *ibus, int i) { - struct nvkm_device *device = ibus->subdev.device; + struct nvkm_subdev *subdev = &ibus->subdev; + struct nvkm_device *device = subdev->device; u32 addr = nvkm_rd32(device, 0x128120 + (i * 0x0800)); u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0800)); u32 stat = nvkm_rd32(device, 0x128128 + (i * 0x0800)); - nv_error(ibus, "GPC%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat); + nvkm_error(subdev, "GPC%d: %06x %08x (%08x)\n", i, addr, data, stat); nvkm_mask(device, 0x128128 + (i * 0x0800), 0x00000200, 0x00000000); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c index 611fc7165469..1b7642343957 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c @@ -53,7 +53,7 @@ gk20a_ibus_intr(struct nvkm_subdev *subdev) u32 status0 = nvkm_rd32(device, 0x120058); if (status0 & 0x7) { - nv_debug(ibus, "resetting ibus ring\n"); + nvkm_debug(subdev, "resetting ibus ring\n"); gk20a_ibus_init_ibus_ring(ibus); } -- 2.30.2