diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:12 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:23 +1000 |
| commit | 18019e95de4ffdfb020d61197b8da2af1a442c8e (patch) | |
| tree | 2754cc38da1201ecd5d25c2d61c648bb7ab5ba44 /drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c | |
| parent | 1cb57d25b6b62b39f07c4ff4370c2c48803000e9 (diff) | |
| download | op-kernel-dev-18019e95de4ffdfb020d61197b8da2af1a442c8e.zip op-kernel-dev-18019e95de4ffdfb020d61197b8da2af1a442c8e.tar.gz | |
drm/nouveau/ibus: switch to subdev printk macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c index 53dd1ba..0ac0bba 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); } |
