---

yaml --- r: 228843 b: refs/heads/master c: eae5e7f h: refs/heads/master i: 228841: f5fee74 228839: 7c0fedd v: v3
git-mirror · Dec 30, 2010 · 51c3baa · 51c3baa
1 parent 47c0949
commit 51c3baa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93d0cd7b9e4855c12b3bb5c9367872476c78fef9
+refs/heads/master: eae5e7f304222ee795936e9466110a9d5d5ec558
diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c b/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -740,6 +740,14 @@ nvc0_graph_isr(struct drm_device *dev)
 		stat &= ~0x00000010;
 	}
 
+	if (stat & 0x00000020) {
+		NV_INFO(dev, "PGRAPH: ILLEGAL_CLASS ch %d [0x%010llx] subc %d "
+			     "class 0x%04x mthd 0x%04x data 0x%08x\n",
+			chid, inst, subc, class, mthd, data);
+		nv_wr32(dev, 0x400100, 0x00000020);
+		stat &= ~0x00000020;
+	}
+
 	if (stat & 0x00100000) {
 		NV_INFO(dev, "PGRAPH: DATA_ERROR [");
 		nouveau_enum_print(nvc0_graph_data_error, code);
@@ -750,6 +758,14 @@ nvc0_graph_isr(struct drm_device *dev)
 		stat &= ~0x00100000;
 	}
 
+	if (stat & 0x00200000) {
+		u32 trap = nv_rd32(dev, 0x400108);
+		NV_INFO(dev, "PGRAPH: TRAP ch %d status 0x%08x\n", chid, trap);
+		nv_wr32(dev, 0x400108, trap);
+		nv_wr32(dev, 0x400100, 0x00200000);
+		stat &= ~0x00200000;
+	}
+
 	if (stat & 0x00080000) {
 		u32 ustat = nv_rd32(dev, 0x409c18);