summaryrefslogtreecommitdiff
path: root/nvkm/engine/fifo
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-02-22 00:19:19 +1000
committerBen Skeggs <bskeggs@redhat.com>2014-03-26 10:57:58 +1000
commitfff13e06c79a565774bea8a8cd82e5224a0f5b3b (patch)
tree132415c28c9b928030c08037b95df71fbd0e8d45 /nvkm/engine/fifo
parent71687afddfd93015fa613206095059205e216f87 (diff)
downloadnouveau-fff13e06c79a565774bea8a8cd82e5224a0f5b3b.tar.gz
fifo/nvc0: mask unhandled intr bits when seen, rather than all intrs
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/engine/fifo')
-rw-r--r--nvkm/engine/fifo/nvc0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nvkm/engine/fifo/nvc0.c b/nvkm/engine/fifo/nvc0.c
index 919980d90..5472f0127 100644
--- a/nvkm/engine/fifo/nvc0.c
+++ b/nvkm/engine/fifo/nvc0.c
@@ -594,9 +594,9 @@ nvc0_fifo_intr(struct nouveau_subdev *subdev)
}
if (stat) {
- nv_fatal(priv, "unhandled status 0x%08x\n", stat);
+ nv_error(priv, "INTR 0x%08x\n", stat);
+ nv_mask(priv, 0x002140, stat, 0x00000000);
nv_wr32(priv, 0x002100, stat);
- nv_wr32(priv, 0x002140, 0);
}
}