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:22 +1000 |
| commit | aa860e4bbe16d5756d6845022a6e94d6cb200df9 (patch) | |
| tree | 970b3ab6270f7f41269f6b4651f81803385fc90b /drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c | |
| parent | drm/nouveau/clk: switch to subdev printk macros (diff) | |
| download | linux-dev-aa860e4bbe16d5756d6845022a6e94d6cb200df9.tar.xz linux-dev-aa860e4bbe16d5756d6845022a6e94d6cb200df9.zip | |
drm/nouveau/devinit: switch to subdev printk macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c index 8e2992038f9f..5158ea62f65a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c @@ -35,7 +35,8 @@ static void nv04_devinit_meminit(struct nvkm_devinit *init) { - struct nvkm_device *device = init->subdev.device; + struct nvkm_subdev *subdev = &init->subdev; + struct nvkm_device *device = subdev->device; u32 patt = 0xdeadbeef; struct io_mapping *fb; int i; @@ -43,7 +44,7 @@ nv04_devinit_meminit(struct nvkm_devinit *init) /* Map the framebuffer aperture */ fb = fbmem_init(device); if (!fb) { - nv_error(init, "failed to map fb\n"); + nvkm_error(subdev, "failed to map fb\n"); return; } @@ -414,6 +415,7 @@ int nv04_devinit_init(struct nvkm_object *object) { struct nv04_devinit *init = (void *)object; + struct nvkm_subdev *subdev = &init->base.subdev; if (!init->base.post) { u32 htotal = nv_rdvgac(init, 0, 0x06); @@ -422,7 +424,7 @@ nv04_devinit_init(struct nvkm_object *object) htotal |= (nv_rdvgac(init, 0, 0x25) & 0x01) << 10; htotal |= (nv_rdvgac(init, 0, 0x41) & 0x01) << 11; if (!htotal) { - nv_info(init, "adaptor not initialised\n"); + nvkm_debug(subdev, "adaptor not initialised\n"); init->base.post = true; } } |