|
@@ -1943,7 +1943,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
|
|
|
if (!dev_priv->mm.gtt) {
|
|
|
DRM_ERROR("Failed to initialize GTT\n");
|
|
|
ret = -ENODEV;
|
|
|
- goto out_iomapfree;
|
|
|
+ goto out_rmmap;
|
|
|
}
|
|
|
|
|
|
agp_size = dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT;
|
|
@@ -1987,7 +1987,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
|
|
|
if (dev_priv->wq == NULL) {
|
|
|
DRM_ERROR("Failed to create our workqueue.\n");
|
|
|
ret = -ENOMEM;
|
|
|
- goto out_iomapfree;
|
|
|
+ goto out_mtrrfree;
|
|
|
}
|
|
|
|
|
|
/* enable GEM by default */
|
|
@@ -2074,13 +2074,21 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
|
|
|
return 0;
|
|
|
|
|
|
out_gem_unload:
|
|
|
+ if (dev_priv->mm.inactive_shrinker.shrink)
|
|
|
+ unregister_shrinker(&dev_priv->mm.inactive_shrinker);
|
|
|
+
|
|
|
if (dev->pdev->msi_enabled)
|
|
|
pci_disable_msi(dev->pdev);
|
|
|
|
|
|
intel_teardown_gmbus(dev);
|
|
|
intel_teardown_mchbar(dev);
|
|
|
destroy_workqueue(dev_priv->wq);
|
|
|
-out_iomapfree:
|
|
|
+out_mtrrfree:
|
|
|
+ if (dev_priv->mm.gtt_mtrr >= 0) {
|
|
|
+ mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,
|
|
|
+ dev->agp->agp_info.aper_size * 1024 * 1024);
|
|
|
+ dev_priv->mm.gtt_mtrr = -1;
|
|
|
+ }
|
|
|
io_mapping_free(dev_priv->mm.gtt_mapping);
|
|
|
out_rmmap:
|
|
|
pci_iounmap(dev->pdev, dev_priv->regs);
|