From: Dave Airlie <airlied@redhat.com>
Date: Fri, 19 Jun 2009 00:29:20 +0000 (+1000)
Subject: drm/i915: enable GEM on PAE.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95934f939c46ea2b37f3c91a4f8c82e003727761;p=linux-beck.git

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>
---

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 */