drm/nouveau: fix some usages of the wrong print function

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

8 files changed, 54 insertions, 50 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
index ab03f7719d2d..fa69ef011992 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
@@ -256,7 +256,7 @@ static const struct drm_plane_funcs nv10_plane_funcs = {
 static void
 nv10_overlay_init(struct drm_device *device)
 {
-        struct nouveau_device *dev = nouveau_dev(device);
+        struct nouveau_drm *drm = nouveau_drm(device);
         struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL);
         int num_formats = ARRAY_SIZE(formats);
         int ret;
@@ -264,7 +264,7 @@ nv10_overlay_init(struct drm_device *device)
         if (!plane)
                 return;
 
-        switch (dev->chipset) {
+        switch (nv_device(drm->device)->chipset) {
         case 0x10:
         case 0x11:
         case 0x15:
@@ -333,7 +333,7 @@ cleanup:
         drm_plane_cleanup(&plane->base);
 err:
         kfree(plane);
-        nv_error(dev, "Failed to create plane\n");
+        NV_ERROR(drm, "Failed to create plane\n");
 }
 
 static int
@@ -447,7 +447,7 @@ static const struct drm_plane_funcs nv04_plane_funcs = {
 static void
 nv04_overlay_init(struct drm_device *device)
 {
-        struct nouveau_device *dev = nouveau_dev(device);
+        struct nouveau_drm *drm = nouveau_drm(device);
         struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL);
         int ret;
 
@@ -483,7 +483,7 @@ cleanup:
         drm_plane_cleanup(&plane->base);
 err:
         kfree(plane);
-        nv_error(dev, "Failed to create plane\n");
+        NV_ERROR(drm, "Failed to create plane\n");
 }
 
 void
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index b0437783002e..397256758c5b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -168,6 +168,7 @@ nouveau_abi16_fini(struct nouveau_abi16 *abi16)
 int
 nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
 {
+        struct nouveau_cli *cli = nouveau_cli(file_priv);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nouveau_device *device = nv_device(drm->device);
         struct nouveau_timer *ptimer = nouveau_timer(device);
@@ -224,7 +225,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
                 getparam->value = graph->units ? graph->units(graph) : 0;
                 break;
         default:
-                nv_debug(device, "unknown parameter %lld\n", getparam->param);
+                NV_PRINTK(debug, cli, "unknown parameter %lld\n", getparam->param);
                 return -EINVAL;
         }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_agp.c b/drivers/gpu/drm/nouveau/nouveau_agp.c
index 51666daddb94..bf6f7fb1b5a2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_agp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_agp.c
@@ -50,7 +50,7 @@ get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info)
                     device->pdev->vendor == quirk->chip_vendor &&
                     device->pdev->device == quirk->chip_device) {
                         agpmode = quirk->mode;
-                        nv_info(device, "Forcing agp mode to %dX. Use agpmode to override.\n",
+                        NV_INFO(drm, "Forcing agp mode to %dX. Use agpmode to override.\n",
                                 agpmode);
                         break;
                 }
@@ -150,7 +150,6 @@ void
 nouveau_agp_init(struct nouveau_drm *drm)
 {
 #if __OS_HAS_AGP
-        struct nouveau_device *device = nv_device(drm->device);
         struct drm_device *dev = drm->dev;
         struct drm_agp_info info;
         struct drm_agp_mode mode;
@@ -162,13 +161,13 @@ nouveau_agp_init(struct nouveau_drm *drm)
 
         ret = drm_agp_acquire(dev);
         if (ret) {
-                nv_error(device, "unable to acquire AGP: %d\n", ret);
+                NV_ERROR(drm, "unable to acquire AGP: %d\n", ret);
                 return;
         }
 
         ret = drm_agp_info(dev, &info);
         if (ret) {
-                nv_error(device, "unable to get AGP info: %d\n", ret);
+                NV_ERROR(drm, "unable to get AGP info: %d\n", ret);
                 return;
         }
 
@@ -177,7 +176,7 @@ nouveau_agp_init(struct nouveau_drm *drm)
 
         ret = drm_agp_enable(dev, mode);
         if (ret) {
-                nv_error(device, "unable to enable AGP: %d\n", ret);
+                NV_ERROR(drm, "unable to enable AGP: %d\n", ret);
                 return;
         }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index d9e7c4023677..51db52f10ad1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -201,7 +201,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,
         max_size = INT_MAX & ~((1 << lpg_shift) - 1);
 
         if (size <= 0 || size > max_size) {
-                nv_warn(drm, "skipped size %x\n", (u32)size);
+                NV_WARN(drm, "skipped size %x\n", (u32)size);
                 return -EINVAL;
         }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index ccb6b452d6d0..938df47a592e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -58,7 +58,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
         }
 
         if (ret)
-                NV_ERROR(cli, "failed to idle channel 0x%08x [%s]\n",
+                NV_PRINTK(error, cli, "failed to idle channel 0x%08x [%s]\n",
                          chan->handle, cli->base.name);
         return ret;
 }
@@ -379,17 +379,17 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nouveau_cli *cli,
 
         ret = nouveau_channel_ind(drm, cli, parent, handle, arg0, pchan);
         if (ret) {
-                NV_DEBUG(cli, "ib channel create, %d\n", ret);
+                NV_PRINTK(debug, cli, "ib channel create, %d\n", ret);
                 ret = nouveau_channel_dma(drm, cli, parent, handle, pchan);
                 if (ret) {
-                        NV_DEBUG(cli, "dma channel create, %d\n", ret);
+                        NV_PRINTK(debug, cli, "dma channel create, %d\n", ret);
                         return ret;
                 }
         }
 
         ret = nouveau_channel_init(*pchan, arg0, arg1);
         if (ret) {
-                NV_ERROR(cli, "channel failed to initialise, %d\n", ret);
+                NV_PRINTK(error, cli, "channel failed to initialise, %d\n", ret);
                 nouveau_channel_del(pchan);
                 return ret;
         }
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
index ab2060767ba9..de8055220266 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
@@ -168,11 +168,15 @@ nouveau_platform_device_create_(struct platform_device *pdev,
                                 int size, void **pobject);
 void nouveau_drm_device_remove(struct drm_device *dev);
 
-#define NV_FATAL(cli, fmt, args...) nv_fatal((cli), fmt, ##args)
-#define NV_ERROR(cli, fmt, args...) nv_error((cli), fmt, ##args)
-#define NV_WARN(cli, fmt, args...) nv_warn((cli), fmt, ##args)
-#define NV_INFO(cli, fmt, args...) nv_info((cli), fmt, ##args)
-#define NV_DEBUG(cli, fmt, args...) nv_debug((cli), fmt, ##args)
+#define NV_PRINTK(l,c,f,a...) do {                                             \
+        struct nouveau_cli *_cli = (c);                                        \
+        nv_##l(_cli, f, ##a);                                                  \
+} while(0)
+#define NV_FATAL(drm,f,a...) NV_PRINTK(fatal, &(drm)->client, f, ##a)
+#define NV_ERROR(drm,f,a...) NV_PRINTK(error, &(drm)->client, f, ##a)
+#define NV_WARN(drm,f,a...) NV_PRINTK(warn, &(drm)->client, f, ##a)
+#define NV_INFO(drm,f,a...) NV_PRINTK(info, &(drm)->client, f, ##a)
+#define NV_DEBUG(drm,f,a...) NV_PRINTK(debug, &(drm)->client, f, ##a)
 
 extern int nouveau_modeset;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index abb7321b35c8..04ebb22a101d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -229,7 +229,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
         int ret = 0;
 
         if (!pfb->memtype_valid(pfb, req->info.tile_flags)) {
-                NV_ERROR(cli, "bad page flags: 0x%08x\n", req->info.tile_flags);
+                NV_PRINTK(error, cli, "bad page flags: 0x%08x\n", req->info.tile_flags);
                 return -EINVAL;
         }
 
@@ -350,7 +350,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
         ww_acquire_init(&op->ticket, &reservation_ww_class);
 retry:
         if (++trycnt > 100000) {
-                NV_ERROR(cli, "%s failed and gave up.\n", __func__);
+                NV_PRINTK(error, cli, "%s failed and gave up.\n", __func__);
                 return -EINVAL;
         }
 
@@ -361,7 +361,7 @@ retry:
 
                 gem = drm_gem_object_lookup(dev, file_priv, b->handle);
                 if (!gem) {
-                        NV_ERROR(cli, "Unknown handle 0x%08x\n", b->handle);
+                        NV_PRINTK(error, cli, "Unknown handle 0x%08x\n", b->handle);
                         ww_acquire_done(&op->ticket);
                         validate_fini(op, NULL);
                         return -ENOENT;
@@ -374,7 +374,7 @@ retry:
                 }
 
                 if (nvbo->reserved_by && nvbo->reserved_by == file_priv) {
-                        NV_ERROR(cli, "multiple instances of buffer %d on "
+                        NV_PRINTK(error, cli, "multiple instances of buffer %d on "
                                       "validation list\n", b->handle);
                         drm_gem_object_unreference_unlocked(gem);
                         ww_acquire_done(&op->ticket);
@@ -396,7 +396,7 @@ retry:
                                 ww_acquire_fini(&op->ticket);
                                 drm_gem_object_unreference_unlocked(gem);
                                 if (ret != -ERESTARTSYS)
-                                        NV_ERROR(cli, "fail reserve\n");
+                                        NV_PRINTK(error, cli, "fail reserve\n");
                                 return ret;
                         }
                 }
@@ -414,7 +414,7 @@ retry:
                 if (b->valid_domains & NOUVEAU_GEM_DOMAIN_GART)
                         list_add_tail(&nvbo->entry, &op->gart_list);
                 else {
-                        NV_ERROR(cli, "invalid valid domains: 0x%08x\n",
+                        NV_PRINTK(error, cli, "invalid valid domains: 0x%08x\n",
                                  b->valid_domains);
                         list_add_tail(&nvbo->entry, &op->both_list);
                         ww_acquire_done(&op->ticket);
@@ -465,20 +465,20 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,
                                              b->write_domains,
                                              b->valid_domains);
                 if (unlikely(ret)) {
-                        NV_ERROR(cli, "fail set_domain\n");
+                        NV_PRINTK(error, cli, "fail set_domain\n");
                         return ret;
                 }
 
                 ret = nouveau_bo_validate(nvbo, true, false);
                 if (unlikely(ret)) {
                         if (ret != -ERESTARTSYS)
-                                NV_ERROR(cli, "fail ttm_validate\n");
+                                NV_PRINTK(error, cli, "fail ttm_validate\n");
                         return ret;
                 }
 
                 ret = validate_sync(chan, nvbo);
                 if (unlikely(ret)) {
-                        NV_ERROR(cli, "fail post-validate sync\n");
+                        NV_PRINTK(error, cli, "fail post-validate sync\n");
                         return ret;
                 }
 
@@ -527,14 +527,14 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
         ret = validate_init(chan, file_priv, pbbo, nr_buffers, op);
         if (unlikely(ret)) {
                 if (ret != -ERESTARTSYS)
-                        NV_ERROR(cli, "validate_init\n");
+                        NV_PRINTK(error, cli, "validate_init\n");
                 return ret;
         }
 
         ret = validate_list(chan, cli, &op->vram_list, pbbo, user_buffers);
         if (unlikely(ret < 0)) {
                 if (ret != -ERESTARTSYS)
-                        NV_ERROR(cli, "validate vram_list\n");
+                        NV_PRINTK(error, cli, "validate vram_list\n");
                 validate_fini(op, NULL);
                 return ret;
         }
@@ -543,7 +543,7 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
         ret = validate_list(chan, cli, &op->gart_list, pbbo, user_buffers);
         if (unlikely(ret < 0)) {
                 if (ret != -ERESTARTSYS)
-                        NV_ERROR(cli, "validate gart_list\n");
+                        NV_PRINTK(error, cli, "validate gart_list\n");
                 validate_fini(op, NULL);
                 return ret;
         }
@@ -552,7 +552,7 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
         ret = validate_list(chan, cli, &op->both_list, pbbo, user_buffers);
         if (unlikely(ret < 0)) {
                 if (ret != -ERESTARTSYS)
-                        NV_ERROR(cli, "validate both_list\n");
+                        NV_PRINTK(error, cli, "validate both_list\n");
                 validate_fini(op, NULL);
                 return ret;
         }
@@ -613,7 +613,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                 uint32_t data;
 
                 if (unlikely(r->bo_index > req->nr_buffers)) {
-                        NV_ERROR(cli, "reloc bo index invalid\n");
+                        NV_PRINTK(error, cli, "reloc bo index invalid\n");
                         ret = -EINVAL;
                         break;
                 }
@@ -623,7 +623,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                         continue;
 
                 if (unlikely(r->reloc_bo_index > req->nr_buffers)) {
-                        NV_ERROR(cli, "reloc container bo index invalid\n");
+                        NV_PRINTK(error, cli, "reloc container bo index invalid\n");
                         ret = -EINVAL;
                         break;
                 }
@@ -631,7 +631,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
 
                 if (unlikely(r->reloc_bo_offset + 4 >
                              nvbo->bo.mem.num_pages << PAGE_SHIFT)) {
-                        NV_ERROR(cli, "reloc outside of bo\n");
+                        NV_PRINTK(error, cli, "reloc outside of bo\n");
                         ret = -EINVAL;
                         break;
                 }
@@ -640,7 +640,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                         ret = ttm_bo_kmap(&nvbo->bo, 0, nvbo->bo.mem.num_pages,
                                           &nvbo->kmap);
                         if (ret) {
-                                NV_ERROR(cli, "failed kmap for reloc\n");
+                                NV_PRINTK(error, cli, "failed kmap for reloc\n");
                                 break;
                         }
                         nvbo->validate_mapped = true;
@@ -665,7 +665,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                 ret = ttm_bo_wait(&nvbo->bo, false, false, false);
                 spin_unlock(&nvbo->bo.bdev->fence_lock);
                 if (ret) {
-                        NV_ERROR(cli, "reloc wait_idle failed: %d\n", ret);
+                        NV_PRINTK(error, cli, "reloc wait_idle failed: %d\n", ret);
                         break;
                 }
 
@@ -711,19 +711,19 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                 goto out_next;
 
         if (unlikely(req->nr_push > NOUVEAU_GEM_MAX_PUSH)) {
-                NV_ERROR(cli, "pushbuf push count exceeds limit: %d max %d\n",
+                NV_PRINTK(error, cli, "pushbuf push count exceeds limit: %d max %d\n",
                          req->nr_push, NOUVEAU_GEM_MAX_PUSH);
                 return nouveau_abi16_put(abi16, -EINVAL);
         }
 
         if (unlikely(req->nr_buffers > NOUVEAU_GEM_MAX_BUFFERS)) {
-                NV_ERROR(cli, "pushbuf bo count exceeds limit: %d max %d\n",
+                NV_PRINTK(error, cli, "pushbuf bo count exceeds limit: %d max %d\n",
                          req->nr_buffers, NOUVEAU_GEM_MAX_BUFFERS);
                 return nouveau_abi16_put(abi16, -EINVAL);
         }
 
         if (unlikely(req->nr_relocs > NOUVEAU_GEM_MAX_RELOCS)) {
-                NV_ERROR(cli, "pushbuf reloc count exceeds limit: %d max %d\n",
+                NV_PRINTK(error, cli, "pushbuf reloc count exceeds limit: %d max %d\n",
                          req->nr_relocs, NOUVEAU_GEM_MAX_RELOCS);
                 return nouveau_abi16_put(abi16, -EINVAL);
         }
@@ -741,7 +741,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         /* Ensure all push buffers are on validate list */
         for (i = 0; i < req->nr_push; i++) {
                 if (push[i].bo_index >= req->nr_buffers) {
-                        NV_ERROR(cli, "push %d buffer not in list\n", i);
+                        NV_PRINTK(error, cli, "push %d buffer not in list\n", i);
                         ret = -EINVAL;
                         goto out_prevalid;
                 }
@@ -752,7 +752,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                                            req->nr_buffers, &op, &do_reloc);
         if (ret) {
                 if (ret != -ERESTARTSYS)
-                        NV_ERROR(cli, "validate: %d\n", ret);
+                        NV_PRINTK(error, cli, "validate: %d\n", ret);
                 goto out_prevalid;
         }
 
@@ -760,7 +760,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         if (do_reloc) {
                 ret = nouveau_gem_pushbuf_reloc_apply(cli, req, bo);
                 if (ret) {
-                        NV_ERROR(cli, "reloc apply: %d\n", ret);
+                        NV_PRINTK(error, cli, "reloc apply: %d\n", ret);
                         goto out;
                 }
         }
@@ -768,7 +768,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         if (chan->dma.ib_max) {
                 ret = nouveau_dma_wait(chan, req->nr_push + 1, 16);
                 if (ret) {
-                        NV_ERROR(cli, "nv50cal_space: %d\n", ret);
+                        NV_PRINTK(error, cli, "nv50cal_space: %d\n", ret);
                         goto out;
                 }
 
@@ -783,7 +783,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         if (nv_device(drm->device)->chipset >= 0x25) {
                 ret = RING_SPACE(chan, req->nr_push * 2);
                 if (ret) {
-                        NV_ERROR(cli, "cal_space: %d\n", ret);
+                        NV_PRINTK(error, cli, "cal_space: %d\n", ret);
                         goto out;
                 }
 
@@ -797,7 +797,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         } else {
                 ret = RING_SPACE(chan, req->nr_push * (2 + NOUVEAU_DMA_SKIPS));
                 if (ret) {
-                        NV_ERROR(cli, "jmp_space: %d\n", ret);
+                        NV_PRINTK(error, cli, "jmp_space: %d\n", ret);
                         goto out;
                 }
 
@@ -835,7 +835,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
 
         ret = nouveau_fence_new(chan, false, &fence);
         if (ret) {
-                NV_ERROR(cli, "error fencing pushbuf: %d\n", ret);
+                NV_PRINTK(error, cli, "error fencing pushbuf: %d\n", ret);
                 WIND_RING(chan);
                 goto out;
         }
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 61fc682accdd..03152add9baa 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -284,7 +284,7 @@ evo_wait(void *evoc, int nr)
                 nv_wo32(dmac->base.user, 0x0000, 0x00000000);
                 if (!nv_wait(dmac->base.user, 0x0004, ~0, 0x00000000)) {
                         mutex_unlock(&dmac->lock);
-                        NV_ERROR(dmac->base.user, "channel stalled\n");
+                        nv_error(dmac->base.user, "channel stalled\n");
                         return NULL;
                 }