diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-28 16:30:41 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-28 16:30:41 -0700 |
| commit | 2c1756b12edc19fdd75c833699cb752e1bbb641e (patch) | |
| tree | 2893f6f8b59bfea0e295877643dc29849a7d1a67 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | cf96e46fcd147856fd8151fab91c410f0ec16c47 (diff) | |
| parent | d74362c9e45689d8d7e3d4bcf6681c4358ef4f2e (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -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 7ef3e8b6864..02f96fd0d52 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) |