From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 3 Sep 2010 05:56:12 +0000 (+1000)
Subject: drm/nv50: report BAR access faults
X-Git-Tag: v2.6.37-rc1~77^2~28^2~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1da265662db0306d04efb5f687c2992e40d1b85c;p=profile%2Fivi%2Fkernel-x86-ivi.git

drm/nv50: report BAR access faults

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 316e058..a818306 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/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);