lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nv50/gr: update list of mp errors, make it a bitfield

Browse Source 
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ilia Mirkin
2014-01-17 06:19:46 -05:00
committed by Ben Skeggs
parent e2dd003dfa
commit f750ecc950
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
View File

@@ -304,12 +304,14 @@ nv84_graph_tlb_flush(struct nouveau_engine *engine)
return timeout ? -EBUSY : 0; return timeout ? -EBUSY : 0;
} }
static const struct nouveau_enum nv50_mp_exec_error_names[] = { static const struct nouveau_bitfield nv50_mp_exec_errors[] = {
{ 3, "STACK_UNDERFLOW", NULL }, { 0x01, "STACK_UNDERFLOW" },
{ 4, "QUADON_ACTIVE", NULL }, { 0x02, "STACK_MISMATCH" },
{ 8, "TIMEOUT", NULL }, { 0x04, "QUADON_ACTIVE" },
{ 0x10, "INVALID_OPCODE", NULL }, { 0x08, "TIMEOUT" },
{ 0x40, "BREAKPOINT", NULL }, { 0x10, "INVALID_OPCODE" },
{ 0x20, "PM_OVERFLOW" },
{ 0x40, "BREAKPOINT" },
{} {}
}; };
@@ -474,8 +476,8 @@ nv50_priv_mp_trap(struct nv50_graph_priv *priv, int tpid, int display)
oplow = nv_rd32(priv, addr + 0x70); oplow = nv_rd32(priv, addr + 0x70);
ophigh = nv_rd32(priv, addr + 0x74); ophigh = nv_rd32(priv, addr + 0x74);
nv_error(priv, "TRAP_MP_EXEC - " nv_error(priv, "TRAP_MP_EXEC - "
"TP %d MP %d: ", tpid, i); "TP %d MP %d:", tpid, i);
nouveau_enum_print(nv50_mp_exec_error_names, status); nouveau_bitfield_print(nv50_mp_exec_errors, status);
pr_cont(" at %06x warp %d, opcode %08x %08x\n", pr_cont(" at %06x warp %d, opcode %08x %08x\n",
pc&0xffffff, pc >> 24, pc&0xffffff, pc >> 24,
oplow, ophigh); oplow, ophigh);