Commit b94be972 authored Sep 23, 2015 by Egbert Eich Committed by Jani Nikula Sep 30, 2015

drm/i915: Call non-locking version of drm_kms_helper_poll_enable(), v2



drm_kms_helper_poll_enable() is called from a context in
intel_hpd_irq_storm_disable() where the the mode_config mutex is
already locked.
When this function was converted to lock this mutex in
commit 8c4ccc4a ("drm/probe-helper: Grab mode_config.mutex
in poll_init/enable") a deadlock occurred.
Call the newly implemented non-locking version of this function.

Changes since v1:
- use function name suffix '_locked' for the function that
  is to be called from a locked context.

Signed-off-by: Egbert Eich <eich@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent 4ad640e9

drivers/gpu/drm/i915/intel_hotplug.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -180,7 +180,7 @@ static void intel_hpd_irq_storm_disable(struct drm_i915_private *dev_priv)

	/* Enable polling and queue hotplug re-enabling. */		/* Enable polling and queue hotplug re-enabling. */
	if (hpd_disabled) {		if (hpd_disabled) {
	drm_kms_helper_poll_enable(dev);		drm_kms_helper_poll_enable_locked(dev);
	mod_delayed_work(system_wq, &dev_priv->hotplug.reenable_work,		mod_delayed_work(system_wq, &dev_priv->hotplug.reenable_work,
	msecs_to_jiffies(HPD_STORM_REENABLE_DELAY));		msecs_to_jiffies(HPD_STORM_REENABLE_DELAY));
	}		}