diff options
| author | Imre Deak <imre.deak@intel.com> | 2016-03-16 13:38:50 +0200 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2016-03-17 15:22:03 +0200 |
| commit | 066de1aadf6aba1911560cf90a5bc8e25ca1aae9 (patch) | |
| tree | 7c72885b80cda5daa16071fbdb93fefce81f36a6 | |
| parent | ee4b6faf96a990d2acc30084f4edf015ca21b9c4 (diff) | |
| download | linux-066de1aadf6aba1911560cf90a5bc8e25ca1aae9.tar.bz2 | |
Fix MCHBAR cleanup on the driver init error path
MCHBAR is cleaned up in i915_mmio_cleanup(), so the separate call in
i915_driver_load() is incorrect.
CC: David Weinehall <david.weinehall@intel.com>
Fixes: ad5c3d3ffbb2 ("drm/i915: Move MCHBAR setup earlier during init")
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-2-git-send-email-imre.deak@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 85b31300103d..1cbd99528329 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1175,7 +1175,6 @@ out_gem_unload: if (dev->pdev->msi_enabled) pci_disable_msi(dev->pdev); - intel_teardown_mchbar(dev); pm_qos_remove_request(&dev_priv->pm_qos); arch_phys_wc_del(dev_priv->gtt.mtrr); io_mapping_free(dev_priv->gtt.mappable); |