diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 13:16:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 13:10:59 -0700 |
| commit | 6b49734139bad7703ccdf0bded005c605f28ca61 (patch) | |
| tree | c8f6b47f26a318dc2817a4a67d8ef1b9fa2365e7 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 2909d2604809e056e5fe3ee102c42cc7899b1739 (diff) | |
Revert "drm/i915: reorder setup sequence to have irqs for output setup"
Revert commit 2a9810441fcc26cf3f006f015f8a62094fe57a90 which is
commit 52d7ecedac3f96fb562cb482c139015372728638 upstream.
This caused problems in 3.8-stable, but all is fine in 3.9-rc.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 3c004038550..fe843389c7b 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -287,10 +287,6 @@ static void i915_hotplug_work_func(struct work_struct *work) struct drm_mode_config *mode_config = &dev->mode_config; struct intel_encoder *encoder; - /* HPD irq before everything is fully set up. */ - if (!dev_priv->enable_hotplug_processing) - return; - mutex_lock(&mode_config->mutex); DRM_DEBUG_KMS("running encoder hotplug functions\n"); |