From 5f15f317fb304f6a2321c033d401f603b365f2d0 Mon Sep 17 00:00:00 2001
From: Stuart Bennett <sb476@cam.ac.uk>
Date: Mon, 7 Jan 2008 17:38:18 +0000
Subject: [PATCH] nouveau: AGP reset correction - don't touch FW bit

---
 shared-core/nv04_mc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-core/nv04_mc.c b/shared-core/nv04_mc.c
index a6a2045d..766f3a33 100644
--- a/shared-core/nv04_mc.c
+++ b/shared-core/nv04_mc.c
@@ -14,8 +14,8 @@ nv04_mc_init(struct drm_device *dev)
 
 	/* clear busmaster bit */
 	NV_WRITE(NV04_PBUS_PCI_NV_1, saved_pci_nv_1 & ~(0x00000001 << 2));
-	/* clear SBA, AGP and FW bits */
-	NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff00f);
+	/* clear SBA and AGP bits */
+	NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0ff);
 
 	/* Power up everything, resetting each individual unit will
 	 * be done later if needed.