drm/nouveau: use pr_cont

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/core/enum.c b/drivers/gpu/drm/nouveau/core/core/enum.c
index 7cc7133d82dee933203effbba2e0560143ad4514..148f91f1b24f9f7cbfa485ce1f87fb6abc090a10 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/core/enum.c
+++ b/drivers/gpu/drm/nouveau/core/core/enum.c
@@ -45,9 +45,9 @@ nouveau_enum_print(const struct nouveau_enum *en, u32 value)
 {
        en = nouveau_enum_find(en, value);
        if (en)
-               printk("%s", en->name);
+               pr_cont("%s", en->name);
        else
-               printk("(unknown enum 0x%08x)", value);
+               pr_cont("(unknown enum 0x%08x)", value);
 }
 
 void
@@ -55,7 +55,7 @@ nouveau_bitfield_print(const struct nouveau_bitfield *bf, u32 value)
 {
        while (bf->name) {
                if (value & bf->mask) {
-                       printk(" %s", bf->name);
+                       pr_cont(" %s", bf->name);
                        value &= ~bf->mask;
                }
 
@@ -63,5 +63,5 @@ nouveau_bitfield_print(const struct nouveau_bitfield *bf, u32 value)
        }
 
        if (value)
-               printk(" (unknown bits 0x%08x)", value);
+               pr_cont(" (unknown bits 0x%08x)", value);
 }

diff --git a/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c b/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
index 283248c7b050134cc9174741eed7a311ee6440fe..6068f5f37ea71444eefc46e3917b7e3af39b47e6 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
@@ -100,7 +100,7 @@ nva3_copy_intr(struct nouveau_subdev *subdev)
        if (stat & 0x00000040) {
                nv_error(falcon, "DISPATCH_ERROR [");
                nouveau_enum_print(nva3_copy_isr_error_name, ssta);
-               printk("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",
+               pr_cont("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",
                       chid, inst << 12, subc, mthd, data);
                nv_wo32(falcon, 0x004, 0x00000040);
                stat &= ~0x00000040;

diff --git a/drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c b/drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c
index b974905127237cdf74052cf9bbbc6d702725ad3f..8d0a440bc0f8ae23e8711a2af022ea32c0528077 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c
@@ -128,7 +128,7 @@ nv84_crypt_intr(struct nouveau_subdev *subdev)
        if (stat) {
                nv_error(priv, "");
                nouveau_bitfield_print(nv84_crypt_intr_mask, stat);
-               printk(" ch %d [0x%010llx] mthd 0x%04x data 0x%08x\n",
+               pr_cont(" ch %d [0x%010llx] mthd 0x%04x data 0x%08x\n",
                       chid, (u64)inst << 12, mthd, data);
        }
 

diff --git a/drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c b/drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c
index 21986f3bf0c8702c82ad3d4e233f59b5d9b8ceeb..1b33c20a61bdada34c5c9db93baafa4c9a36c555 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c
@@ -102,7 +102,7 @@ nv98_crypt_intr(struct nouveau_subdev *subdev)
        if (stat & 0x00000040) {
                nv_error(priv, "DISPATCH_ERROR [");
                nouveau_enum_print(nv98_crypt_isr_error_name, ssta);
-               printk("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",
+               pr_cont("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",
                       chid, (u64)inst << 12, subc, mthd, data);
                nv_wr32(priv, 0x087004, 0x00000040);
                stat &= ~0x00000040;

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
index b4365dde1859bfd332a11548e9034b662c3ce51a..d34147586260a3ebff2138b82fa5c686f632c16e 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
@@ -420,16 +420,16 @@ nvc0_fifo_isr_vm_fault(struct nvc0_fifo_priv *priv, int unit)
        nv_error(priv, "%s fault at 0x%010llx [", (stat & 0x00000080) ?
                 "write" : "read", (u64)vahi << 32 | valo);
        nouveau_enum_print(nvc0_fifo_fault_reason, stat & 0x0000000f);
-       printk("] from ");
+       pr_cont("] from ");
        nouveau_enum_print(nvc0_fifo_fault_unit, unit);
        if (stat & 0x00000040) {
-               printk("/");
+               pr_cont("/");
                nouveau_enum_print(nvc0_fifo_fault_hubclient, client);
        } else {
-               printk("/GPC%d/", (stat & 0x1f000000) >> 24);
+               pr_cont("/GPC%d/", (stat & 0x1f000000) >> 24);
                nouveau_enum_print(nvc0_fifo_fault_gpcclient, client);
        }
-       printk(" on channel 0x%010llx\n", (u64)inst << 12);
+       pr_cont(" on channel 0x%010llx\n", (u64)inst << 12);
 }
 
 static int
@@ -484,7 +484,7 @@ nvc0_fifo_isr_subfifo_intr(struct nvc0_fifo_priv *priv, int unit)
        if (show) {
                nv_error(priv, "SUBFIFO%d:", unit);
                nouveau_bitfield_print(nvc0_fifo_subfifo_intr, show);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "SUBFIFO%d: ch %d subc %d mthd 0x%04x "
                               "data 0x%08x\n",
                         unit, chid, subc, mthd, data);

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index c930da99c2c16df8f0185d6b0a41d8196fe884fe..c874c2413c2e0ff440bfb770cf3980f37a6d4041 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -416,16 +416,16 @@ nve0_fifo_isr_vm_fault(struct nve0_fifo_priv *priv, int unit)
        nv_error(priv, "PFIFO: %s fault at 0x%010llx [", (stat & 0x00000080) ?
                       "write" : "read", (u64)vahi << 32 | valo);
        nouveau_enum_print(nve0_fifo_fault_reason, stat & 0x0000000f);
-       printk("] from ");
+       pr_cont("] from ");
        nouveau_enum_print(nve0_fifo_fault_unit, unit);
        if (stat & 0x00000040) {
-               printk("/");
+               pr_cont("/");
                nouveau_enum_print(nve0_fifo_fault_hubclient, client);
        } else {
-               printk("/GPC%d/", (stat & 0x1f000000) >> 24);
+               pr_cont("/GPC%d/", (stat & 0x1f000000) >> 24);
                nouveau_enum_print(nve0_fifo_fault_gpcclient, client);
        }
-       printk(" on channel 0x%010llx\n", (u64)inst << 12);
+       pr_cont(" on channel 0x%010llx\n", (u64)inst << 12);
 }
 
 static int
@@ -480,7 +480,7 @@ nve0_fifo_isr_subfifo_intr(struct nve0_fifo_priv *priv, int unit)
        if (show) {
                nv_error(priv, "SUBFIFO%d:", unit);
                nouveau_bitfield_print(nve0_fifo_subfifo_intr, show);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "SUBFIFO%d: ch %d subc %d mthd 0x%04x "
                               "data 0x%08x\n",
                         unit, chid, subc, mthd, data);

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv04.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv04.c
index e30a9c5ff1fceb0a093fcbe7261956cd2cc6c0bf..f4fb84463761ca7102d5664a33f52dcbbe18b264 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv04.c
@@ -1299,11 +1299,11 @@ nv04_graph_intr(struct nouveau_subdev *subdev)
        if (show) {
                nv_error(priv, "");
                nouveau_bitfield_print(nv04_graph_intr_name, show);
-               printk(" nsource:");
+               pr_cont(" nsource:");
                nouveau_bitfield_print(nv04_graph_nsource, nsource);
-               printk(" nstatus:");
+               pr_cont(" nstatus:");
                nouveau_bitfield_print(nv04_graph_nstatus, nstatus);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "ch %d/%d class 0x%04x "
                               "mthd 0x%04x data 0x%08x\n",
                         chid, subc, class, mthd, data);

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv10.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv10.c
index 5c0f843ea2491af49724e18d8d6432b0beed90cd..deea80fb031a3d74d23d7bcff1d50c852d0d0588 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv10.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv10.c
@@ -1195,11 +1195,11 @@ nv10_graph_intr(struct nouveau_subdev *subdev)
        if (show) {
                nv_error(priv, "");
                nouveau_bitfield_print(nv10_graph_intr_name, show);
-               printk(" nsource:");
+               pr_cont(" nsource:");
                nouveau_bitfield_print(nv04_graph_nsource, nsource);
-               printk(" nstatus:");
+               pr_cont(" nstatus:");
                nouveau_bitfield_print(nv10_graph_nstatus, nstatus);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "ch %d/%d class 0x%04x "
                               "mthd 0x%04x data 0x%08x\n",
                         chid, subc, class, mthd, data);

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
index 5b20401bf9118639c35636f804341400ac203bc3..4c0d79c552b6ba1dd70c059d31f5b4bd3be2f2d6 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
@@ -226,11 +226,11 @@ nv20_graph_intr(struct nouveau_subdev *subdev)
        if (show) {
                nv_error(priv, "");
                nouveau_bitfield_print(nv10_graph_intr_name, show);
-               printk(" nsource:");
+               pr_cont(" nsource:");
                nouveau_bitfield_print(nv04_graph_nsource, nsource);
-               printk(" nstatus:");
+               pr_cont(" nstatus:");
                nouveau_bitfield_print(nv10_graph_nstatus, nstatus);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "ch %d/%d class 0x%04x mthd 0x%04x data 0x%08x\n",
                        chid, subc, class, mthd, data);
        }

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
index 0b36dd3deebd1013aa721081ec189061f414bdb4..961a07304ef22d72b7366f89a668c108da5b4bdb 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
@@ -323,11 +323,11 @@ nv40_graph_intr(struct nouveau_subdev *subdev)
        if (show) {
                nv_error(priv, "");
                nouveau_bitfield_print(nv10_graph_intr_name, show);
-               printk(" nsource:");
+               pr_cont(" nsource:");
                nouveau_bitfield_print(nv04_graph_nsource, nsource);
-               printk(" nstatus:");
+               pr_cont(" nstatus:");
                nouveau_bitfield_print(nv10_graph_nstatus, nstatus);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "ch %d [0x%08x] subc %d class 0x%04x "
                               "mthd 0x%04x data 0x%08x\n",
                         chid, inst << 4, subc, class, mthd, data);

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
index b1c3d835b4c257ee1f6c74853c257bb0ee771dfa..2c9e9adf6d92447cdf1531d451bda7b194334910 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
@@ -418,7 +418,7 @@ nv50_priv_mp_trap(struct nv50_graph_priv *priv, int tpid, int display)
                        nv_error(priv, "TRAP_MP_EXEC - "
                                        "TP %d MP %d: ", tpid, i);
                        nouveau_enum_print(nv50_mp_exec_error_names, status);
-                       printk(" at %06x warp %d, opcode %08x %08x\n",
+                       pr_cont(" at %06x warp %d, opcode %08x %08x\n",
                                        pc&0xffffff, pc >> 24,
                                        oplow, ophigh);
                }
@@ -623,7 +623,7 @@ nv50_graph_trap_handler(struct nv50_graph_priv *priv, u32 display,
                if (display) {
                        nv_error(priv, "TRAP_M2MF");
                        nouveau_bitfield_print(nv50_graph_trap_m2mf, ustatus);
-                       printk("\n");
+                       pr_cont("\n");
                        nv_error(priv, "TRAP_M2MF %08x %08x %08x %08x\n",
                                nv_rd32(priv, 0x406804), nv_rd32(priv, 0x406808),
                                nv_rd32(priv, 0x40680c), nv_rd32(priv, 0x406810));
@@ -644,7 +644,7 @@ nv50_graph_trap_handler(struct nv50_graph_priv *priv, u32 display,
                if (display) {
                        nv_error(priv, "TRAP_VFETCH");
                        nouveau_bitfield_print(nv50_graph_trap_vfetch, ustatus);
-                       printk("\n");
+                       pr_cont("\n");
                        nv_error(priv, "TRAP_VFETCH %08x %08x %08x %08x\n",
                                nv_rd32(priv, 0x400c00), nv_rd32(priv, 0x400c08),
                                nv_rd32(priv, 0x400c0c), nv_rd32(priv, 0x400c10));
@@ -661,7 +661,7 @@ nv50_graph_trap_handler(struct nv50_graph_priv *priv, u32 display,
                if (display) {
                        nv_error(priv, "TRAP_STRMOUT");
                        nouveau_bitfield_print(nv50_graph_trap_strmout, ustatus);
-                       printk("\n");
+                       pr_cont("\n");
                        nv_error(priv, "TRAP_STRMOUT %08x %08x %08x %08x\n",
                                nv_rd32(priv, 0x401804), nv_rd32(priv, 0x401808),
                                nv_rd32(priv, 0x40180c), nv_rd32(priv, 0x401810));
@@ -682,7 +682,7 @@ nv50_graph_trap_handler(struct nv50_graph_priv *priv, u32 display,
                if (display) {
                        nv_error(priv, "TRAP_CCACHE");
                        nouveau_bitfield_print(nv50_graph_trap_ccache, ustatus);
-                       printk("\n");
+                       pr_cont("\n");
                        nv_error(priv, "TRAP_CCACHE %08x %08x %08x %08x"
                                     " %08x %08x %08x\n",
                                nv_rd32(priv, 0x405000), nv_rd32(priv, 0x405004),
@@ -774,7 +774,7 @@ nv50_graph_intr(struct nouveau_subdev *subdev)
                u32 ecode = nv_rd32(priv, 0x400110);
                nv_error(priv, "DATA_ERROR ");
                nouveau_enum_print(nv50_data_error_names, ecode);
-               printk("\n");
+               pr_cont("\n");
        }
 
        if (stat & 0x00200000) {
@@ -788,7 +788,7 @@ nv50_graph_intr(struct nouveau_subdev *subdev)
        if (show) {
                nv_error(priv, "");
                nouveau_bitfield_print(nv50_graph_intr_name, show);
-               printk("\n");
+               pr_cont("\n");
                nv_error(priv, "ch %d [0x%010llx] subc %d class 0x%04x "
                               "mthd 0x%04x data 0x%08x\n",
                         chid, (u64)inst << 12, subc, class, mthd, data);

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 45aff5f5085aa83d8837309cb8117f620950d0bd..e644298ff5ea5142914b312ed225b0e362a346fb 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -454,7 +454,7 @@ nvc0_graph_intr(struct nouveau_subdev *subdev)
        if (stat & 0x00100000) {
                nv_error(priv, "DATA_ERROR [");
                nouveau_enum_print(nv50_data_error_names, code);
-               printk("] ch %d [0x%010llx] subc %d class 0x%04x "
+               pr_cont("] ch %d [0x%010llx] subc %d class 0x%04x "
                       "mthd 0x%04x data 0x%08x\n",
                       chid, inst << 12, subc, class, mthd, data);
                nv_wr32(priv, 0x400100, 0x00100000);

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
index 9f82e9702b4661208cf1f021ee246fcb721a986e..0f35a34c4b06e88fe67461622d75f7f86af20a2e 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
@@ -166,7 +166,7 @@ nve0_graph_intr(struct nouveau_subdev *subdev)
        if (stat & 0x00100000) {
                nv_error(priv, "DATA_ERROR [");
                nouveau_enum_print(nv50_data_error_names, code);
-               printk("] ch %d [0x%010llx] subc %d class 0x%04x "
+               pr_cont("] ch %d [0x%010llx] subc %d class 0x%04x "
                       "mthd 0x%04x data 0x%08x\n",
                       chid, inst, subc, class, mthd, data);
                nv_wr32(priv, 0x400100, 0x00100000);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
index 487cb8c6c204dda270d1957e869b42beae4fdccd..88bdb021763ef0fb05822fdbd7e5cfd6646798ec 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
@@ -372,30 +372,30 @@ nv50_fb_intr(struct nouveau_subdev *subdev)
 
        en = nouveau_enum_find(vm_engine, st0);
        if (en)
-               printk("%s/", en->name);
+               pr_cont("%s/", en->name);
        else
-               printk("%02x/", st0);
+               pr_cont("%02x/", st0);
 
        cl = nouveau_enum_find(vm_client, st2);
        if (cl)
-               printk("%s/", cl->name);
+               pr_cont("%s/", cl->name);
        else
-               printk("%02x/", st2);
+               pr_cont("%02x/", st2);
 
        if      (cl && cl->data) cl = nouveau_enum_find(cl->data, st3);
        else if (en && en->data) cl = nouveau_enum_find(en->data, st3);
        else                     cl = NULL;
        if (cl)
-               printk("%s", cl->name);
+               pr_cont("%s", cl->name);
        else
-               printk("%02x", st3);
+               pr_cont("%02x", st3);
 
-       printk(" reason: ");
+       pr_cont(" reason: ");
        en = nouveau_enum_find(vm_fault, st1);
        if (en)
-               printk("%s\n", en->name);
+               pr_cont("%s\n", en->name);
        else
-               printk("0x%08x\n", st1);
+               pr_cont("0x%08x\n", st1);
 }
 
 static int

diff --git a/drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.c b/drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.c
index 839ca1edc132e9c1db915522c3b573f549821574..4bde7f7f7b81d2e14363e9990d93aa07d3e168fe 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.c
@@ -156,15 +156,15 @@ mxms_foreach(struct nouveau_mxm *mxm, u8 types,
 
                        nv_debug(mxm, "%4s: ", mxms_desc_name[type]);
                        for (j = headerlen - 1; j >= 0; j--)
-                               printk("%02x", dump[j]);
-                       printk("\n");
+                               pr_cont("%02x", dump[j]);
+                       pr_cont("\n");
                        dump += headerlen;
 
                        for (i = 0; i < entries; i++, dump += recordlen) {
                                nv_debug(mxm, "      ");
                                for (j = recordlen - 1; j >= 0; j--)
-                                       printk("%02x", dump[j]);
-                               printk("\n");
+                                       pr_cont("%02x", dump[j]);
+                               pr_cont("\n");
                        }
                }
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 235de99ae37a524842eae7c0fcf84c667717fad5..b64065781a4a6ae979692d98e0e545b8de44fbe1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -1884,9 +1884,9 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios)
                if (conn[0] != 0xff) {
                        NV_INFO(drm, "DCB conn %02d: ", idx);
                        if (olddcb_conntab(dev)[3] < 4)
-                               printk("%04x\n", ROM16(conn[0]));
+                               pr_cont("%04x\n", ROM16(conn[0]));
                        else
-                               printk("%08x\n", ROM32(conn[0]));
+                               pr_cont("%08x\n", ROM32(conn[0]));
                }
        }
        dcb_fake_connectors(bios);