summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2011-10-09 22:58:32 +0200
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 19:01:17 +1000
commitc983e6f660dd39758b032a2de4c8844ff2575278 (patch)
tree14d7fa2ca919cad10d79c86ef50957ce49d57778 /drivers/gpu
parentb29caa5885e85bbda7c84ea55721b9e79718583a (diff)
downloadop-kernel-dev-c983e6f660dd39758b032a2de4c8844ff2575278.zip
op-kernel-dev-c983e6f660dd39758b032a2de4c8844ff2575278.tar.gz
drm/nv50: also report errors in MP1/MP2 when they happen.
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_graph.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index ac601f7..33d5711 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -616,9 +616,9 @@ nv50_pgraph_tp_trap(struct drm_device *dev, int type, uint32_t ustatus_old,
}
break;
case 7: /* MP error */
- if (ustatus & 0x00010000) {
+ if (ustatus & 0x04030000) {
nv50_pgraph_mp_trap(dev, i, display);
- ustatus &= ~0x00010000;
+ ustatus &= ~0x04030000;
}
break;
case 8: /* TPDMA error */
OpenPOWER on IntegriCloud