---

yaml --- r: 299355 b: refs/heads/master c: c291be9 h: refs/heads/master i: 299353: e873e46 299351: 25ab1e5 v: v3
git-mirror · Apr 16, 2012 · 383c4ca · 383c4ca
1 parent cb0f960
commit 383c4ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9bef081c3c3f77bec54454872e98d3ec635756f
+refs/heads/master: c291be9dba370ba696a0d482249a212cf5c15f45
diff --git a/trunk/drivers/gpu/drm/i915/intel_fb.c b/trunk/drivers/gpu/drm/i915/intel_fb.c
@@ -279,11 +279,15 @@ void intel_fb_restore_mode(struct drm_device *dev)
 	struct drm_mode_config *config = &dev->mode_config;
 	struct drm_plane *plane;
 
+	mutex_lock(&dev->mode_config.mutex);
+
 	ret = drm_fb_helper_restore_fbdev_mode(&dev_priv->fbdev->helper);
 	if (ret)
 		DRM_DEBUG("failed to restore crtc mode\n");
 
 	/* Be sure to shut off any planes that may be active */
 	list_for_each_entry(plane, &config->plane_list, head)
 		plane->funcs->disable_plane(plane);
+
+	mutex_unlock(&dev->mode_config.mutex);
 }