diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 |
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) | |||
1146 | "performance may suffer.\n"); | 1146 | "performance may suffer.\n"); |
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | #ifdef CONFIG_HIGHMEM64G | ||
1150 | /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */ | ||
1151 | dev_priv->has_gem = 0; | ||
1152 | #else | ||
1153 | /* enable GEM by default */ | 1149 | /* enable GEM by default */ |
1154 | dev_priv->has_gem = 1; | 1150 | dev_priv->has_gem = 1; |
1155 | #endif | ||
1156 | 1151 | ||
1157 | dev->driver->get_vblank_counter = i915_get_vblank_counter; | 1152 | dev->driver->get_vblank_counter = i915_get_vblank_counter; |
1158 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ | 1153 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ |