]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/i915: Switch to using pci_iounmap in conjunction with pci_iomap
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 29 Oct 2010 20:02:18 +0000 (21:02 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 29 Oct 2010 20:02:18 +0000 (21:02 +0100)
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>
drivers/gpu/drm/i915/i915_dma.c

index 00d8fb3e989fc40d9090688c489040177fcee510..eee88cfcb3aa4278860a36dc128ee869fae89086 100644 (file)
@@ -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);