evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/ibus: switch to subdev printk macros

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:12 +10:00
parent 1cb57d25b6
commit 18019e95de
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c
View file

@ -26,33 +26,36 @@
static void static void
gf100_ibus_intr_hub(struct nvkm_ibus *ibus, int i) 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 addr = nvkm_rd32(device, 0x122120 + (i * 0x0400));
u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0400)); u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0400));
u32 stat = nvkm_rd32(device, 0x122128 + (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); nvkm_mask(device, 0x122128 + (i * 0x0400), 0x00000200, 0x00000000);
} }
static void static void
gf100_ibus_intr_rop(struct nvkm_ibus *ibus, int i) 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 addr = nvkm_rd32(device, 0x124120 + (i * 0x0400));
u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0400)); u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0400));
u32 stat = nvkm_rd32(device, 0x124128 + (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); nvkm_mask(device, 0x124128 + (i * 0x0400), 0x00000200, 0x00000000);
} }
static void static void
gf100_ibus_intr_gpc(struct nvkm_ibus *ibus, int i) 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 addr = nvkm_rd32(device, 0x128120 + (i * 0x0400));
u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0400)); u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0400));
u32 stat = nvkm_rd32(device, 0x128128 + (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); nvkm_mask(device, 0x128128 + (i * 0x0400), 0x00000200, 0x00000000);
} }

15
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c
View file

@ -26,33 +26,36 @@
static void static void
gk104_ibus_intr_hub(struct nvkm_ibus *ibus, int i) 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 addr = nvkm_rd32(device, 0x122120 + (i * 0x0800));
u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0800)); u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0800));
u32 stat = nvkm_rd32(device, 0x122128 + (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); nvkm_mask(device, 0x122128 + (i * 0x0800), 0x00000200, 0x00000000);
} }
static void static void
gk104_ibus_intr_rop(struct nvkm_ibus *ibus, int i) 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 addr = nvkm_rd32(device, 0x124120 + (i * 0x0800));
u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0800)); u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0800));
u32 stat = nvkm_rd32(device, 0x124128 + (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); nvkm_mask(device, 0x124128 + (i * 0x0800), 0x00000200, 0x00000000);
} }
static void static void
gk104_ibus_intr_gpc(struct nvkm_ibus *ibus, int i) 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 addr = nvkm_rd32(device, 0x128120 + (i * 0x0800));
u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0800)); u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0800));
u32 stat = nvkm_rd32(device, 0x128128 + (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); nvkm_mask(device, 0x128128 + (i * 0x0800), 0x00000200, 0x00000000);
} }

2
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
View file

@ -53,7 +53,7 @@ gk20a_ibus_intr(struct nvkm_subdev *subdev)
u32 status0 = nvkm_rd32(device, 0x120058); u32 status0 = nvkm_rd32(device, 0x120058);
if (status0 & 0x7) { if (status0 & 0x7) {
nv_debug(ibus, "resetting ibus ring\n"); nvkm_debug(subdev, "resetting ibus ring\n");
gk20a_ibus_init_ibus_ring(ibus); gk20a_ibus_init_ibus_ring(ibus);
} }