From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 29 Oct 2010 20:02:18 +0000 (+0100)
Subject: drm/i915: Switch to using pci_iounmap in conjunction with pci_iomap
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6dda569fe0fb71a03e2a2e815761796f98232cdb;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

drm/i915: Switch to using pci_iounmap in conjunction with pci_iomap

After switching the MMIO registers to use pci_iomap, remember to dispose
of the mapping with pci_iounmap (for symmetry).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 00d8fb3e989f..eee88cfcb3aa 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2082,7 +2082,7 @@ out_workqueue_free:
 out_iomapfree:
 	io_mapping_free(dev_priv->mm.gtt_mapping);
 out_rmmap:
-	iounmap(dev_priv->regs);
+	pci_iounmap(dev->pdev, dev_priv->regs);
 put_bridge:
 	pci_dev_put(dev_priv->bridge_dev);
 free_priv:
@@ -2168,7 +2168,7 @@ int i915_driver_unload(struct drm_device *dev)
 	}
 
 	if (dev_priv->regs != NULL)
-		iounmap(dev_priv->regs);
+		pci_iounmap(dev->pdev, dev_priv->regs);
 
 	intel_teardown_gmbus(dev);
 	intel_teardown_mchbar(dev);