summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-06-19 02:29:20 +0200
committerDave Airlie <airlied@redhat.com>2009-06-19 02:29:20 +0200
commit95934f939c46ea2b37f3c91a4f8c82e003727761 (patch)
tree655f730bc8d836d9820972a10a12a43c11d06e95 /drivers
parentdrm/radeon: fix unused variables warning (diff)
downloadlinux-95934f939c46ea2b37f3c91a4f8c82e003727761.tar.xz
linux-95934f939c46ea2b37f3c91a4f8c82e003727761.zip
drm/i915: enable GEM on PAE.
In theory now that the AGP subsystem is using struct page, we should have on problems enabling GEM on PAE systems. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 9b28c55c54fa..f112c769d533 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1146,13 +1146,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
"performance may suffer.\n");
}
-#ifdef CONFIG_HIGHMEM64G
- /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
- dev_priv->has_gem = 0;
-#else
/* enable GEM by default */
dev_priv->has_gem = 1;
-#endif
dev->driver->get_vblank_counter = i915_get_vblank_counter;
dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */