[PATCH] drm/i915: Hold mode_config lock whilst changing mode for lastclose()

[PATCH] drm/i915: Hold mode_config lock whilst changing mode for lastclose()

[Chris Wilson]

Upon lastclose(), we switch back to the fbcon configuration. This
requires taking the mode_config lock in order to serialise the change
with output probing elsewhere.

Reported-by: Oleksij Rempel <bug-track@fisher-privat.net>
References: https://bugs.freedesktop.org/show_bug.cgi?id=48652
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
---
 drivers/gpu/drm/i915/intel_fb.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 53d14a0..8da5a37 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -289,6 +289,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");
@@ -296,4 +298,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);
 }
-- 
1.7.10

Re: [PATCH] drm/i915: Hold mode_config lock whilst changing mode for lastclose()

[Daniel Vetter]

On Mon, Apr 16, 2012 at 03:16:42PM +0100, Chris Wilson wrote:
> Upon lastclose(), we switch back to the fbcon configuration. This
> requires taking the mode_config lock in order to serialise the change
> with output probing elsewhere.
> 
> Reported-by: Oleksij Rempel <bug-track@fisher-privat.net>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=48652
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org
Picked up for -fixes (with Jesse's irc ack), thanks for the patch.
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48