When inlining the actual hpd output probing in

commit 69787f7da6b2adc4054357a661aaa1701a9ca76f
Author: Daniel Vetter <daniel.vet...@ffwll.ch>
Date:   Tue Oct 23 18:23:34 2012 +0000

    drm: run the hpd irq event code directly

the check for the drm_kms_hlper.poll module option was lost. This
regressed systems where this option is used to work-around output
probing issues (like irq storms). Restore the old behaviour.

v2: Rebased over more than 2 years of history :(

Reported-by: George Amanakis <g_amana...@yahoo.com>
Cc: George Amanakis <g_amana...@yahoo.com>
Cc: Dave Airlie <airl...@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
 drivers/gpu/drm/drm_probe_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_probe_helper.c 
b/drivers/gpu/drm/drm_probe_helper.c
index 04203c0d2ecb..7356f3e75e4f 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -491,7 +491,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev)
        enum drm_connector_status old_status;
        bool changed = false;
 
-       if (!dev->mode_config.poll_enabled)
+       if (!dev->mode_config.poll_enabled || !drm_kms_helper_poll)
                return false;
 
        mutex_lock(&dev->mode_config.mutex);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to