From f00cd1cfa117b7962fafbac4328e01455dc205db Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 3 Sep 2010 15:56:12 +1000
Subject: [PATCH] --- yaml --- r: 218183 b: refs/heads/master c:
 1da265662db0306d04efb5f687c2992e40d1b85c h: refs/heads/master i:   218181:
 c8fa980c6be6678d890cac4ccabfc9eb81fd49f1   218179:
 add337b1eb59f5b6f2d9415fbbc7187a4b3ffeff   218175:
 25c3c4767a9e5854582549b6c12ab22dc6d1f822 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 974e71d5ee96..236474e770cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d96773e7b61d9976b8227e018a1c94fb7374e641
+refs/heads/master: 1da265662db0306d04efb5f687c2992e40d1b85c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_irq.c b/trunk/drivers/gpu/drm/nouveau/nouveau_irq.c
index 316e0587fb01..a818306781cc 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -228,6 +228,14 @@ nouveau_fifo_irq_handler(struct drm_device *dev)
 			nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 1);
 		}
 
+		if (dev_priv->card_type == NV_50) {
+			if (status & 0x00000010) {
+				nv50_fb_vm_trap(dev, 1, "PFIFO_BAR_FAULT");
+				status &= ~0x00000010;
+				nv_wr32(dev, 0x002100, 0x00000010);
+			}
+		}
+
 		if (status) {
 			NV_INFO(dev, "PFIFO_INTR 0x%08x - Ch %d\n",
 				status, chid);