[Intel-gfx] [PATCH v2 01/17] Fix MCHBAR cleanup on the driver init error path

David Weinehall david.weinehall at linux.intel.com
Tue Mar 15 06:30:12 UTC 2016


On Fri, Mar 11, 2016 at 06:31:26PM +0200, Imre Deak wrote:
> MCHBAR is cleaned up in i915_mmio_cleanup(), so the separate call in
> i915_driver_load() is incorrect.
> 
> CC: David Weinehall <david.weinehall at intel.com>
> Fixes: ad5c3d3ffbb2 ("drm/i915: Move MCHBAR setup earlier during init")
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_dma.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 4aa3db6..fbb9815 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);

Reviewed-by: David Weinehall <david.weinehall at linux.intel.com>


More information about the Intel-gfx mailing list