projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee4b6fa)
Fix MCHBAR cleanup on the driver init error path
authorImre Deak <imre.deak@intel.com>
Wed, 16 Mar 2016 11:38:50 +0000 (13:38 +0200)
committerImre Deak <imre.deak@intel.com>
Thu, 17 Mar 2016 13:22:03 +0000 (15:22 +0200)
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
drivers/gpu/drm/i915/i915_dma.c patch | blob | blame | history

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 85b31300103d9eb2d99d32a26e276d9f3c0dd798..1cbd99528329c215f3a8c454d90cec18a7000933 100644 (file)
--- 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);