This is a note to let you know that I've just added the patch titled
drm/i915: Fixup for 'Hold mode_config->mutex during hotplug'
to the 3.0-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-fixup-for-hold-mode_config-mutex-during-hotplug.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 40ee3381dd1010432acc13e907329029096c5bfc Mon Sep 17 00:00:00 2001
From: Keith Packard <[email protected]>
Date: Thu, 28 Jul 2011 15:31:19 -0700
Subject: drm/i915: Fixup for 'Hold mode_config->mutex during hotplug'
From: Keith Packard <[email protected]>
commit 40ee3381dd1010432acc13e907329029096c5bfc upstream.
drm_helper_hpd_irq_event queues another work proc to go and deliver
the user-space event, and that function also wants to hold the config
mutex, so we shouldn't hold the mutex across the
drm_helper_hpd_irq_event call.
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/i915_irq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -313,10 +313,10 @@ static void i915_hotplug_work_func(struc
if (encoder->hot_plug)
encoder->hot_plug(encoder);
+ mutex_unlock(&mode_config->mutex);
+
/* Just fire off a uevent and let userspace tell us what to do */
drm_helper_hpd_irq_event(dev);
-
- mutex_unlock(&mode_config->mutex);
}
static void i915_handle_rps_change(struct drm_device *dev)
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/drm-i915-hold-mode_config-mutex-during-hotplug-processing.patch
queue-3.0/drm-i915-load-the-lut-before-pipe-enable-on-ilk.patch
queue-3.0/drm-i915-fixup-for-hold-mode_config-mutex-during-hotplug.patch
queue-3.0/drm-i915-fix-typo-in-drm_i915_overlay_put_image-ioctl.patch
queue-3.0/drm-i915-pch-fix-integer-math-bugs-in-panel-fitting.patch
queue-3.0/drm-i915-initialize-rcs-ring-status-page-address-in.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
