Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae4ba737 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nouveau: raise reporting levels of some messages 



Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 507ceb15

drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c

+5 −5
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ nv04_fifo_intr(struct nouveau_subdev *subdev) 
			}



			if (!nv04_fifo_swmthd(priv, chid, mthd, data)) {

				nv_info(priv, "CACHE_ERROR - Ch %d/%d "

				nv_error(priv, "CACHE_ERROR - Ch %d/%d "

					      "Mthd 0x%04x Data 0x%08x\n",

					chid, (mthd >> 13) & 7, mthd & 0x1ffc,

					data);
@@ -476,7 +476,7 @@ nv04_fifo_intr(struct nouveau_subdev *subdev) 
				u32 ib_get = nv_rd32(priv, 0x003334);

				u32 ib_put = nv_rd32(priv, 0x003330);



				nv_info(priv, "DMA_PUSHER - Ch %d Get 0x%02x%08x "

				nv_error(priv, "DMA_PUSHER - Ch %d Get 0x%02x%08x "

				     "Put 0x%02x%08x IbGet 0x%08x IbPut 0x%08x "

				     "State 0x%08x (err: %s) Push 0x%08x\n",

					chid, ho_get, dma_get, ho_put,
@@ -494,7 +494,7 @@ nv04_fifo_intr(struct nouveau_subdev *subdev) 
					nv_wr32(priv, 0x003334, ib_put);

				}

			} else {

				nv_info(priv, "DMA_PUSHER - Ch %d Get 0x%08x "

				nv_error(priv, "DMA_PUSHER - Ch %d Get 0x%08x "

					     "Put 0x%08x State 0x%08x (err: %s) Push 0x%08x\n",

					chid, dma_get, dma_put, state,

					nv_dma_state_err(state), push);
@@ -531,7 +531,7 @@ nv04_fifo_intr(struct nouveau_subdev *subdev) 
		}



		if (status) {

			nv_info(priv, "unknown intr 0x%08x, ch %d\n",

			nv_warn(priv, "unknown intr 0x%08x, ch %d\n",

				status, chid);

			nv_wr32(priv, NV03_PFIFO_INTR_0, status);

			status = 0;
@@ -541,7 +541,7 @@ nv04_fifo_intr(struct nouveau_subdev *subdev) 
	}



	if (status) {

		nv_info(priv, "still angry after %d spins, halt\n", cnt);

		nv_error(priv, "still angry after %d spins, halt\n", cnt);

		nv_wr32(priv, 0x002140, 0);

		nv_wr32(priv, 0x000140, 0);

	}

drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ nvc0_fifo_intr(struct nouveau_subdev *subdev) 
	u32 stat = nv_rd32(priv, 0x002100) & mask;



	if (stat & 0x00000100) {

		nv_info(priv, "unknown status 0x00000100\n");

		nv_warn(priv, "unknown status 0x00000100\n");

		nv_wr32(priv, 0x002100, 0x00000100);

		stat &= ~0x00000100;

	}

drivers/gpu/drm/nouveau/core/engine/graph/nv20.c

+2 −2
Original line number Diff line number Diff line
@@ -224,14 +224,14 @@ nv20_graph_intr(struct nouveau_subdev *subdev) 
	nv_wr32(priv, NV04_PGRAPH_FIFO, 0x00000001);



	if (show) {

		nv_info(priv, "");

		nv_error(priv, "");

		nouveau_bitfield_print(nv10_graph_intr_name, show);

		printk(" nsource:");

		nouveau_bitfield_print(nv04_graph_nsource, nsource);

		printk(" nstatus:");

		nouveau_bitfield_print(nv10_graph_nstatus, nstatus);

		printk("\n");

		nv_info(priv, "ch %d/%d class 0x%04x mthd 0x%04x data 0x%08x\n",

		nv_error(priv, "ch %d/%d class 0x%04x mthd 0x%04x data 0x%08x\n",

			chid, subc, class, mthd, data);

	}

drivers/gpu/drm/nouveau/core/engine/graph/nv40.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ nv40_graph_intr(struct nouveau_subdev *subdev) 
	nv_wr32(priv, NV04_PGRAPH_FIFO, 0x00000001);



	if (show) {

		nv_info(priv, "");

		nv_error(priv, "");

		nouveau_bitfield_print(nv10_graph_intr_name, show);

		printk(" nsource:");

		nouveau_bitfield_print(nv04_graph_nsource, nsource);

drivers/gpu/drm/nouveau/core/engine/graph/nv50.c

+3 −3
Original line number Diff line number Diff line
@@ -521,13 +521,13 @@ nv50_priv_tp_trap(struct nv50_graph_priv *priv, int type, u32 ustatus_old, 
		}

		if (ustatus) {

			if (display)

				nv_info(priv, "%s - TP%d: Unhandled ustatus 0x%08x\n", name, i, ustatus);

				nv_error(priv, "%s - TP%d: Unhandled ustatus 0x%08x\n", name, i, ustatus);

		}

		nv_wr32(priv, ustatus_addr, 0xc0000000);

	}



	if (!tps && display)

		nv_info(priv, "%s - No TPs claiming errors?\n", name);

		nv_warn(priv, "%s - No TPs claiming errors?\n", name);

}



static int
@@ -786,7 +786,7 @@ nv50_graph_intr(struct nouveau_subdev *subdev) 
	nv_wr32(priv, 0x400500, 0x00010001);



	if (show) {

		nv_info(priv, "");

		nv_error(priv, "");

		nouveau_bitfield_print(nv50_graph_intr_name, show);

		printk("\n");

		nv_error(priv, "ch %d [0x%010llx] subc %d class 0x%04x "