Skip to content

Commit

Permalink
drm/i915: Fixup for 'Hold mode_config->mutex during hotplug'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Keith Packard committed Jul 28, 2011
1 parent e851946 commit 40ee338
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/i915_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 40ee338

Please sign in to comment.