]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/nv50: also report errors in MP1/MP2 when they happen.
authorMaxim Levitsky <maximlevitsky@gmail.com>
Sun, 9 Oct 2011 20:58:32 +0000 (22:58 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 21 Dec 2011 09:01:17 +0000 (19:01 +1000)
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_graph.c

index ac601f7c4e1a01c7175c9a201f3474e958ef98b7..33d5711a918d659aa000789fd43748bcd020c857 100644 (file)
@@ -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 */