diff options
| author | Daniel Vetter | 2014-08-06 15:04:56 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-08-13 14:23:35 +0200 |
| commit | 90d0a0e8d0e64c92c4a6147f3c7cdc7c544d6b1a (patch) | |
| tree | e364502a615eca1c0651d045732182fc9cb7017c /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: Extract common cleanup into i915_ppgtt_release (diff) | |
| download | kernel-qcow2-linux-90d0a0e8d0e64c92c4a6147f3c7cdc7c544d6b1a.tar.gz kernel-qcow2-linux-90d0a0e8d0e64c92c4a6147f3c7cdc7c544d6b1a.tar.xz kernel-qcow2-linux-90d0a0e8d0e64c92c4a6147f3c7cdc7c544d6b1a.zip | |
drm/i915: Extract commmon global gtt cleanup code
We want to move the aliasing ppgtt cleanup back into the global
gtt cleanup code for symmetry, but first we need to create such
a place.
Reviewed-by: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 895f9f2f35ea..c9af48503f76 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1821,7 +1821,7 @@ out_mtrrfree: arch_phys_wc_del(dev_priv->gtt.mtrr); io_mapping_free(dev_priv->gtt.mappable); out_gtt: - dev_priv->gtt.base.cleanup(&dev_priv->gtt.base); + i915_global_gtt_cleanup(dev); out_regs: intel_uncore_fini(dev); pci_iounmap(dev->pdev, dev_priv->regs); @@ -1920,7 +1920,7 @@ int i915_driver_unload(struct drm_device *dev) destroy_workqueue(dev_priv->wq); pm_qos_remove_request(&dev_priv->pm_qos); - dev_priv->gtt.base.cleanup(&dev_priv->gtt.base); + i915_global_gtt_cleanup(dev); intel_uncore_fini(dev); if (dev_priv->regs != NULL) |