Commit 46a7b625 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nv50/gr: decode texture trap status code 



Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c33e05a1

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

+16 −0
Original line number Diff line number Diff line
@@ -330,6 +330,15 @@ static const struct nouveau_bitfield nv50_mpc_traps[] = { 
	{}

};



static const struct nouveau_bitfield nv50_tex_traps[] = {

	{ 0x00000001, "" }, /* any bit set? */

	{ 0x00000002, "FAULT" },

	{ 0x00000004, "STORAGE_TYPE_MISMATCH" },

	{ 0x00000008, "LINEAR_MISMATCH" },

	{ 0x00000020, "WRONG_MEMTYPE" },

	{}

};



static const struct nouveau_bitfield nv50_graph_trap_m2mf[] = {

	{ 0x00000001, "NOTIFY" },

	{ 0x00000002, "IN" },
@@ -532,6 +541,13 @@ nv50_priv_tp_trap(struct nv50_graph_priv *priv, int type, u32 ustatus_old, 
				for (r = ustatus_addr + 4; r <= ustatus_addr + 0x10; r += 4)

					nv_error(priv, "\t0x%08x: 0x%08x\n", r,

						nv_rd32(priv, r));

				if (ustatus) {

					nv_error(priv, "%s - TP%d:", name, i);

					nouveau_bitfield_print(nv50_tex_traps,

							       ustatus);

					pr_cont("\n");

					ustatus = 0;

				}

			}

			break;

		case 7: /* MP error */