From 00d4957d62607873c2bf0c506fab4ff6c384b414 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 21 Oct 2005 08:59:56 +0000
Subject: Don't set MTRR's for intel hardware

---
 linux-core/i915_drv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linux-core')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index a5f24806..8a8eb598 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -43,8 +43,11 @@ extern int i915_max_ioctl;
 
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
+	/* don't use mtrr's here, the Xserver or user space app should
+	 * deal with them for intel hardware.
+	 */
 	.driver_features =
-	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
+	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR | */
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
 	.load = i915_driver_load,
 	.lastclose = i915_driver_lastclose,
-- 
cgit v1.2.3