diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-26 06:44:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-26 06:44:03 +1000 |
| commit | 54a07c7bb0da0343734c78212bbe9f3735394962 (patch) | |
| tree | 714efff4608ddc0dda7dc85ca82ae98e2c58b52c /drivers/gpu/drm/i915/intel_hotplug.c | |
| parent | 932790109f62aa52bdb4bb62aa66653c0b51bc75 (diff) | |
Revert "drm/probe-helpers: Drop locking from poll_enable"drm-fixes-for-v4.10-rc6-revert-one
This reverts commit 3846fd9b86001bea171943cc3bb9222cb6da6b42.
There were some precursor commits missing for this around connector
locking, we should probably merge Lyude's nouveau avoid the problem patch.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hotplug.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hotplug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c index b62e3f8ad415..3d546c019de0 100644 --- a/drivers/gpu/drm/i915/intel_hotplug.c +++ b/drivers/gpu/drm/i915/intel_hotplug.c @@ -180,7 +180,7 @@ static void intel_hpd_irq_storm_disable(struct drm_i915_private *dev_priv) /* Enable polling and queue hotplug re-enabling. */ 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, msecs_to_jiffies(HPD_STORM_REENABLE_DELAY)); } @@ -511,7 +511,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work) } if (enabled) - drm_kms_helper_poll_enable(dev); + drm_kms_helper_poll_enable_locked(dev); mutex_unlock(&dev->mode_config.mutex); |