Commit cbb47d17 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm/i915: Add some missing steps to i915_driver_load error path

We missed adding a few cleanup steps for recent additions.

Reviewer:  Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f6aca45c
...@@ -1561,7 +1561,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1561,7 +1561,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
ret = i915_gem_gtt_init(dev); ret = i915_gem_gtt_init(dev);
if (ret) if (ret)
goto put_bridge; goto out_regs;
if (drm_core_check_feature(dev, DRIVER_MODESET)) if (drm_core_check_feature(dev, DRIVER_MODESET))
i915_kick_out_firmware_fb(dev_priv); i915_kick_out_firmware_fb(dev_priv);
...@@ -1590,7 +1590,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1590,7 +1590,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
aperture_size); aperture_size);
if (dev_priv->gtt.mappable == NULL) { if (dev_priv->gtt.mappable == NULL) {
ret = -EIO; ret = -EIO;
goto out_rmmap; goto out_gtt;
} }
dev_priv->gtt.mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base, dev_priv->gtt.mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,
...@@ -1664,7 +1664,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1664,7 +1664,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
ret = i915_load_modeset_init(dev); ret = i915_load_modeset_init(dev);
if (ret < 0) { if (ret < 0) {
DRM_ERROR("failed to init modeset\n"); DRM_ERROR("failed to init modeset\n");
goto out_gem_unload; goto out_power_well;
} }
} else { } else {
/* Start out suspended in ums mode. */ /* Start out suspended in ums mode. */
...@@ -1684,6 +1684,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1684,6 +1684,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
return 0; return 0;
out_power_well:
if (HAS_POWER_WELL(dev))
i915_remove_power_well(dev);
drm_vblank_cleanup(dev);
out_gem_unload: out_gem_unload:
if (dev_priv->mm.inactive_shrinker.scan_objects) if (dev_priv->mm.inactive_shrinker.scan_objects)
unregister_shrinker(&dev_priv->mm.inactive_shrinker); unregister_shrinker(&dev_priv->mm.inactive_shrinker);
...@@ -1697,12 +1701,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1697,12 +1701,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
out_mtrrfree: out_mtrrfree:
arch_phys_wc_del(dev_priv->gtt.mtrr); arch_phys_wc_del(dev_priv->gtt.mtrr);
io_mapping_free(dev_priv->gtt.mappable); io_mapping_free(dev_priv->gtt.mappable);
out_gtt:
list_del(&dev_priv->gtt.base.global_link);
drm_mm_takedown(&dev_priv->gtt.base.mm);
dev_priv->gtt.base.cleanup(&dev_priv->gtt.base); dev_priv->gtt.base.cleanup(&dev_priv->gtt.base);
out_rmmap: out_regs:
pci_iounmap(dev->pdev, dev_priv->regs); pci_iounmap(dev->pdev, dev_priv->regs);
put_bridge: put_bridge:
pci_dev_put(dev_priv->bridge_dev); pci_dev_put(dev_priv->bridge_dev);
free_priv: free_priv:
if (dev_priv->slab)
kmem_cache_destroy(dev_priv->slab);
kfree(dev_priv); kfree(dev_priv);
return ret; return ret;
} }
...@@ -1793,6 +1802,8 @@ int i915_driver_unload(struct drm_device *dev) ...@@ -1793,6 +1802,8 @@ int i915_driver_unload(struct drm_device *dev)
WARN_ON(!list_empty(&dev_priv->vm_list)); WARN_ON(!list_empty(&dev_priv->vm_list));
drm_mm_takedown(&dev_priv->gtt.base.mm); drm_mm_takedown(&dev_priv->gtt.base.mm);
drm_vblank_cleanup(dev);
intel_teardown_gmbus(dev); intel_teardown_gmbus(dev);
intel_teardown_mchbar(dev); intel_teardown_mchbar(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment