drm/nouveau/sec: switch to subdev printk macros

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h b/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
index a5d4c65bbbc20a6ad93097fc59ef6cfcf694f5a4..40429a82f79228971134b680a451585609e6ecc8 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
@@ -10,7 +10,6 @@ struct nvkm_enum {
 };
 
 const struct nvkm_enum *nvkm_enum_find(const struct nvkm_enum *, u32 value);
-const struct nvkm_enum *nvkm_enum_print(const struct nvkm_enum *, u32 value);
 
 struct nvkm_bitfield {
        u32 mask;

diff --git a/drivers/gpu/drm/nouveau/nvkm/core/enum.c b/drivers/gpu/drm/nouveau/nvkm/core/enum.c
index 64bdbd04a73ab8655e8905a70d41b4f38382a268..b9581feb24ccb722727c981485ed7e8b9489b5e8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/core/enum.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/enum.c
@@ -38,17 +38,6 @@ nvkm_enum_find(const struct nvkm_enum *en, u32 value)
        return NULL;
 }
 
-const struct nvkm_enum *
-nvkm_enum_print(const struct nvkm_enum *en, u32 value)
-{
-       en = nvkm_enum_find(en, value);
-       if (en)
-               pr_cont("%s", en->name);
-       else
-               pr_cont("(unknown enum 0x%08x)", value);
-       return en;
-}
-
 void
 nvkm_snprintbf(char *data, int size, const struct nvkm_bitfield *bf, u32 value)
 {

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
index a1096f0e40814fdf15fe5e94b97aa1dc14b4b854..b60719092154c65bdf54ab3bf9848df9e28eac1f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
@@ -84,23 +84,25 @@ g98_sec_intr(struct nvkm_subdev *subdev)
        u32 mthd = (addr & 0x07ff) << 2;
        u32 subc = (addr & 0x3800) >> 11;
        u32 data = nvkm_rd32(device, 0x087044);
+       const struct nvkm_enum *en;
        int chid;
 
        engctx = nvkm_engctx_get(engine, inst);
        chid   = fifo->chid(fifo, engctx);
 
        if (stat & 0x00000040) {
-               nv_error(sec, "DISPATCH_ERROR [");
-               nvkm_enum_print(g98_sec_isr_error_name, ssta);
-               pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n",
-                      chid, (u64)inst << 12, nvkm_client_name(engctx),
-                      subc, mthd, data);
+               en = nvkm_enum_find(g98_sec_isr_error_name, ssta);
+               nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] "
+                                  "ch %d [%010llx %s] subc %d "
+                                  "mthd %04x data %08x\n", ssta,
+                          en ? en->name : "", chid, (u64)inst << 12,
+                          nvkm_client_name(engctx), subc, mthd, data);
                nvkm_wr32(device, 0x087004, 0x00000040);
                stat &= ~0x00000040;
        }
 
        if (stat) {
-               nv_error(sec, "unhandled intr 0x%08x\n", stat);
+               nvkm_error(subdev, "intr %08x\n", stat);
                nvkm_wr32(device, 0x087004, stat);
        }