---

yaml --- r: 18240 b: refs/heads/master c: 792d2b9 h: refs/heads/master v: v3
git-mirror · Nov 11, 2005 · 9eef9f7 · 9eef9f7
1 parent 75b5304
commit 9eef9f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ccf800e9415daf9214eb667318e356f9a3d81fc
+refs/heads/master: 792d2b9a12594522111fbe2a7f17460a4d7edff7
diff --git a/trunk/drivers/char/drm/i915_drv.c b/trunk/drivers/char/drm/i915_drv.c
@@ -39,8 +39,11 @@ static struct pci_device_id pciidlist[] = {
 };
 
 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,