---

yaml --- r: 298529 b: refs/heads/master c: 927a2f1 h: refs/heads/master i: 298527: 1b8de4a v: v3
git-mirror · Apr 3, 2012 · 24456de · 24456de
1 parent fd1abc1
commit 24456de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e02f14cd48a5da0ebaecf88c93dbd54a81e0dead
+refs/heads/master: 927a2f119e8235238a2fc64871051b16c9bdae75
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -538,7 +538,9 @@ static int i915_drm_thaw(struct drm_device *dev)
 		drm_irq_install(dev);
 
 		/* Resume the modeset for every activated CRTC */
+		mutex_lock(&dev->mode_config.mutex);
 		drm_helper_resume_force_mode(dev);
+		mutex_unlock(&dev->mode_config.mutex);
 
 		if (IS_IRONLAKE_M(dev))
 			ironlake_enable_rc6(dev);