From 26bd7e6bf50ed7491953ddda0398fb61707e15b9 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 18 Dec 2012 15:24:37 +0100
Subject: [PATCH] --- yaml --- r: 357929 b: refs/heads/master c:
 4d7bb01162b768ca0f7e50aa3f31790d8d08402c h: refs/heads/master i:   357927:
 f9e3f07380f4ad91ac8e454c6b84a4e94d93b257 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c        | 3 ---
 trunk/drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +++
 trunk/drivers/gpu/drm/i915/intel_display.c   | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 62bda5fffbcb..6e27c88d815e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfd07d72cf70cc8845006b698b55369f5d9c2733
+refs/heads/master: 4d7bb01162b768ca0f7e50aa3f31790d8d08402c
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index a99c46d1e49a..272e500c920e 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/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);
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_stolen.c b/trunk/drivers/gpu/drm/i915/i915_gem_stolen.c
index f817b0cac116..f21ae17e298f 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -173,7 +173,10 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
 
 void i915_gem_cleanup_stolen(struct drm_device *dev)
 {
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
 	i915_gem_stolen_cleanup_compression(dev);
+	drm_mm_takedown(&dev_priv->mm.stolen);
 }
 
 int i915_gem_init_stolen(struct drm_device *dev)
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 1bb68169aaf0..f7f4ef17cbe4 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -8869,6 +8869,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	flush_scheduled_work();
 
 	drm_mode_config_cleanup(dev);
+
+	intel_cleanup_overlay(dev);
 }
 
 /*