summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-11-11 15:30:27 +0300
committerDave Airlie <airlied@linux.ie>2005-11-11 15:30:27 +0300
commit792d2b9a12594522111fbe2a7f17460a4d7edff7 (patch)
treebf2463b4047d35555b882969adf21ec9202f7527 /drivers
parent7ccf800e9415daf9214eb667318e356f9a3d81fc (diff)
downloadlinux-792d2b9a12594522111fbe2a7f17460a4d7edff7.tar.xz
drm: drop mtrr from i915
Alan Hourihane wants to set MTRR in the DDX only as otherwise we get problems with the shared memory chipset. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/drm/i915_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index 32b7f8bb420d..e88d32d286f5 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/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,