This is a note to let you know that I've just added the patch titled
drm/i915: Hold mode_config lock whilst changing mode for lastclose()
to the 3.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-hold-mode_config-lock-whilst-changing-mode-for-lastclose.patch
and it can be found in the queue-3.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From c291be9dba370ba696a0d482249a212cf5c15f45 Mon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
Date: Mon, 16 Apr 2012 15:16:42 +0100
Subject: drm/i915: Hold mode_config lock whilst changing mode for lastclose()
From: Chris Wilson <[email protected]>
commit c291be9dba370ba696a0d482249a212cf5c15f45 upstream.
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 <[email protected]>
References: https://bugs.freedesktop.org/show_bug.cgi?id=48652
Signed-off-by: Chris Wilson <[email protected]>
Acked-by: Jesse Barnes <[email protected]>
Signed-Off-by: Daniel Vetter <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/intel_fb.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -283,6 +283,8 @@ void intel_fb_restore_mode(struct drm_de
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");
@@ -290,4 +292,6 @@ void intel_fb_restore_mode(struct drm_de
/* 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);
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.3/drm-i915-hold-mode_config-lock-whilst-changing-mode-for-lastclose.patch
queue-3.3/drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
