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/nv10.c | |
parent | b907649e7be734a4911f83b67a14e3425fa8a2a1 (diff) | |
download | op-kernel-dev-aa860e4bbe16d5756d6845022a6e94d6cb200df9.zip op-kernel-dev-aa860e4bbe16d5756d6845022a6e94d6cb200df9.tar.gz |
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/nv10.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c index f0d47d1..5f54906 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c @@ -32,7 +32,8 @@ static void nv10_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; static const int mem_width[] = { 0x10, 0x00, 0x20 }; int mem_width_count; uint32_t patt = 0xdeadbeef; @@ -47,7 +48,7 @@ nv10_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; } |