---

yaml --- r: 174553 b: refs/heads/master c: 69341a5 h: refs/heads/master i: 174551: 33eaa73 v: v3
git-mirror · Dec 1, 2009 · 27e7639 · 27e7639
1 parent 9d4e85b
commit 27e7639
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33db679b4ee94e5a55abb439a87905d76739095a
+refs/heads/master: 69341a5e01897714f968b7dccb94f57137acf45f
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4584,8 +4584,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	intel_increase_renderclock(dev, false);
 	del_timer_sync(&dev_priv->idle_timer);
 
-	mutex_unlock(&dev->struct_mutex);
-
 	if (dev_priv->display.disable_fbc)
 		dev_priv->display.disable_fbc(dev);
 
@@ -4594,6 +4592,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
 		drm_gem_object_unreference(dev_priv->pwrctx);
 	}
 
+	mutex_unlock(&dev->struct_mutex);
+
 	drm_mode_config_cleanup(dev);
 }