From 24456de13bcd74ead1466d19037e21c6b4ae779b Mon Sep 17 00:00:00 2001
From: Sean Paul <seanpaul@chromium.org>
Date: Fri, 23 Mar 2012 08:52:58 -0400
Subject: [PATCH] --- yaml --- r: 298529 b: refs/heads/master c:
 927a2f119e8235238a2fc64871051b16c9bdae75 h: refs/heads/master i:   298527:
 1b8de4a8de4499c03018e6fe5810d1d6113902a8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf82ce856834..79b29319135d 100644
--- 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
index 19d55bc54873..dfa55e7478fb 100644
--- 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);