diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-18 15:24:37 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-18 16:06:51 +0100 |
| commit | 4d7bb01162b768ca0f7e50aa3f31790d8d08402c (patch) | |
| tree | 4b40b6c443094957d4e1ecc44df19f0bdd9774d1 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | dfd07d72cf70cc8845006b698b55369f5d9c2733 (diff) | |
| download | linux-stable-4d7bb01162b768ca0f7e50aa3f31790d8d08402c.tar.gz linux-stable-4d7bb01162b768ca0f7e50aa3f31790d8d08402c.tar.bz2 linux-stable-4d7bb01162b768ca0f7e50aa3f31790d8d08402c.zip | |
drm/i915: fixup overlay stolen memory leak
We need to clean up the overlay first, before taking down the
stolen memory allocator.
This regression has been introducec in
commit 8040513870399f1cb032cb8bc805df5042fedcdf
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Nov 15 11:32:29 2012 +0000
drm/i915: Allocate overlay registers from stolen memory
v2: Rework the patch a bit as suggested by Chris Wilson:
- move the overlay teardown up, into the modeset cleanup
- move the stolen mm takedown into i915_gem_cleanup_stolen
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a99c46d1e49a..272e500c920e 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1737,9 +1737,6 @@ int i915_driver_unload(struct drm_device *dev) mutex_unlock(&dev->struct_mutex); i915_gem_cleanup_aliasing_ppgtt(dev); i915_gem_cleanup_stolen(dev); - drm_mm_takedown(&dev_priv->mm.stolen); - - intel_cleanup_overlay(dev); if (!I915_NEED_GFX_HWS(dev)) i915_free_hws(dev); |