| Message ID | 1355180865-3455-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 11 Dec 2012 00:07:45 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > 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 Time for a philosophical debate; I suggest the bug was latent and that the cleanup order was wrong originally. Here, we probably want to cleanup the overlay earlier, before we start tidying up the [pp]gtt etc. Also you want to move the drm_mm_takedown() into i915_gem_cleanup_stolen() for symmetry. -Chris
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index ad488f6..532ad39 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1720,9 +1720,9 @@ 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); + drm_mm_takedown(&dev_priv->mm.stolen); if (!I915_NEED_GFX_HWS(dev)) i915_free_hws(dev);
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 Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)