diff options
author | Eric Anholt <eric@anholt.net> | 2009-01-23 15:57:47 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-02-08 06:37:50 -0500 |
commit | ab657db12d7020629f26f30d287558a8d0e32b41 (patch) | |
tree | 66672f54f4958beae00b98d0bb1f464ff9e08a65 /drivers/gpu/drm/i915/i915_gem.c | |
parent | 725e30ad6601d7fe443d9215d6331758a9d7e0c8 (diff) |
drm/i915: Set up an MTRR covering the GTT at driver load.
We'd love to just be using PAT, but even on chips with PAT it gets disabled
sometimes due to an errata. It would probably be better to have pat_enabled
exported and only bother with this when !pat_enabled.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a590d61ff692..af8034d52511 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -3229,10 +3229,6 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, | |||
3229 | dev_priv->mm.wedged = 0; | 3229 | dev_priv->mm.wedged = 0; |
3230 | } | 3230 | } |
3231 | 3231 | ||
3232 | dev_priv->mm.gtt_mapping = io_mapping_create_wc(dev->agp->base, | ||
3233 | dev->agp->agp_info.aper_size | ||
3234 | * 1024 * 1024); | ||
3235 | |||
3236 | mutex_lock(&dev->struct_mutex); | 3232 | mutex_lock(&dev->struct_mutex); |
3237 | dev_priv->mm.suspended = 0; | 3233 | dev_priv->mm.suspended = 0; |
3238 | 3234 | ||
@@ -3255,7 +3251,6 @@ int | |||
3255 | i915_gem_leavevt_ioctl(struct drm_device *dev, void *data, | 3251 | i915_gem_leavevt_ioctl(struct drm_device *dev, void *data, |
3256 | struct drm_file *file_priv) | 3252 | struct drm_file *file_priv) |
3257 | { | 3253 | { |
3258 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
3259 | int ret; | 3254 | int ret; |
3260 | 3255 | ||
3261 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 3256 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
@@ -3264,7 +3259,6 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data, | |||
3264 | ret = i915_gem_idle(dev); | 3259 | ret = i915_gem_idle(dev); |
3265 | drm_irq_uninstall(dev); | 3260 | drm_irq_uninstall(dev); |
3266 | 3261 | ||
3267 | io_mapping_free(dev_priv->mm.gtt_mapping); | ||
3268 | return ret; | 3262 | return ret; |
3269 | } | 3263 | } |
3270 | 3264 | ||