diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-29 20:40:07 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-29 20:40:07 -0500 |
commit | eae5e7f304222ee795936e9466110a9d5d5ec558 (patch) | |
tree | 858b7142a8e2eaf9317587c3f04d424f5ee4318d /drivers/gpu | |
parent | 93d0cd7b9e4855c12b3bb5c9367872476c78fef9 (diff) |
drm/nvc0: parse a couple more PGRAPH_INTR
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_graph.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c index c28bc7b04d27..8352d6b92cca 100644 --- a/drivers/gpu/drm/nouveau/nvc0_graph.c +++ b/drivers/gpu/drm/nouveau/nvc0_graph.c | |||
@@ -740,6 +740,14 @@ nvc0_graph_isr(struct drm_device *dev) | |||
740 | stat &= ~0x00000010; | 740 | stat &= ~0x00000010; |
741 | } | 741 | } |
742 | 742 | ||
743 | if (stat & 0x00000020) { | ||
744 | NV_INFO(dev, "PGRAPH: ILLEGAL_CLASS ch %d [0x%010llx] subc %d " | ||
745 | "class 0x%04x mthd 0x%04x data 0x%08x\n", | ||
746 | chid, inst, subc, class, mthd, data); | ||
747 | nv_wr32(dev, 0x400100, 0x00000020); | ||
748 | stat &= ~0x00000020; | ||
749 | } | ||
750 | |||
743 | if (stat & 0x00100000) { | 751 | if (stat & 0x00100000) { |
744 | NV_INFO(dev, "PGRAPH: DATA_ERROR ["); | 752 | NV_INFO(dev, "PGRAPH: DATA_ERROR ["); |
745 | nouveau_enum_print(nvc0_graph_data_error, code); | 753 | nouveau_enum_print(nvc0_graph_data_error, code); |
@@ -750,6 +758,14 @@ nvc0_graph_isr(struct drm_device *dev) | |||
750 | stat &= ~0x00100000; | 758 | stat &= ~0x00100000; |
751 | } | 759 | } |
752 | 760 | ||
761 | if (stat & 0x00200000) { | ||
762 | u32 trap = nv_rd32(dev, 0x400108); | ||
763 | NV_INFO(dev, "PGRAPH: TRAP ch %d status 0x%08x\n", chid, trap); | ||
764 | nv_wr32(dev, 0x400108, trap); | ||
765 | nv_wr32(dev, 0x400100, 0x00200000); | ||
766 | stat &= ~0x00200000; | ||
767 | } | ||
768 | |||
753 | if (stat & 0x00080000) { | 769 | if (stat & 0x00080000) { |
754 | u32 ustat = nv_rd32(dev, 0x409c18); | 770 | u32 ustat = nv_rd32(dev, 0x409c18); |
755 | 771 | ||