diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-28 15:31:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:35 -0700 |
| commit | c1c741511cbe9fe55257959a83d1fa4361afc5dd (patch) | |
| tree | fca812d5d2ce5f960a151c35850f968dad0fdd5a | |
| parent | 8b01249b9fe0697eb66e8d0bf41a714d91d039ce (diff) | |
| download | kernel_samsung_smdk4412-c1c741511cbe9fe55257959a83d1fa4361afc5dd.zip kernel_samsung_smdk4412-c1c741511cbe9fe55257959a83d1fa4361afc5dd.tar.gz kernel_samsung_smdk4412-c1c741511cbe9fe55257959a83d1fa4361afc5dd.tar.bz2 | |
drm/i915: Fixup for 'Hold mode_config->mutex during hotplug'
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 <keithp@keithp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 9da2a2c..9b1d669 100644 --- 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(struct work_struct *work) 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) |