From 383c4ca8e1b1ecc9cf0dd4dc9e4df7a99e425291 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 16 Apr 2012 15:16:42 +0100 Subject: [PATCH] --- yaml --- r: 299355 b: refs/heads/master c: c291be9dba370ba696a0d482249a212cf5c15f45 h: refs/heads/master i: 299353: e873e46c804c49a143a49aab1db6d2928ad1bea7 299351: 25ab1e5c6a2145c09598d310e8f72257bc6b5450 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8ebd88214ba7..aaab56fa7ca7 100644 --- 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 index 19ecd78b8a2c..6e9ee33fd412 100644 --- a/trunk/drivers/gpu/drm/i915/intel_fb.c +++ b/trunk/drivers/gpu/drm/i915/intel_fb.c @@ -279,6 +279,8 @@ 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"); @@ -286,4 +288,6 @@ void intel_fb_restore_mode(struct drm_device *dev) /* 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); }