---

yaml --- r: 357929 b: refs/heads/master c: 4d7bb01 h: refs/heads/master i: 357927: f9e3f07 v: v3
git-mirror · Dec 18, 2012 · 26bd7e6 · 26bd7e6
1 parent ad2e608
commit 26bd7e6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -8869,6 +8869,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	flush_scheduled_work();
 
 	drm_mode_config_cleanup(dev);
+
+	intel_cleanup_overlay(dev);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -8869,6 +8869,8 @@ void intel_modeset_cleanup(struct drm_device *dev) @@
     	flush_scheduled_work();
     	drm_mode_config_cleanup(dev);
+    	intel_cleanup_overlay(dev);
     }
     /*
@@ Expand Down @@