drm/nv50/gr: decode texture trap status code

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ilia Mirkin 2014-02-14 14:28:36 -05:00 committed by Ben Skeggs
parent c33e05a136
commit 46a7b62596

View File

@ -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[] = { static const struct nouveau_bitfield nv50_graph_trap_m2mf[] = {
{ 0x00000001, "NOTIFY" }, { 0x00000001, "NOTIFY" },
{ 0x00000002, "IN" }, { 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) for (r = ustatus_addr + 4; r <= ustatus_addr + 0x10; r += 4)
nv_error(priv, "\t0x%08x: 0x%08x\n", r, nv_error(priv, "\t0x%08x: 0x%08x\n", r,
nv_rd32(priv, 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; break;
case 7: /* MP error */ case 7: /* MP error */