[Intel-gfx] [PATCH] drm/kms-helper: disable hpd_irq handling when poll=0

[Daniel Vetter]

When inlining the actual hpd output probing in

commit 69787f7da6b2adc4054357a661aaa1701a9ca76f
Author: Daniel Vetter <daniel.vetter at 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.

Reported-by: George Amanakis <g_amanakis at yahoo.com>
Cc: George Amanakis <g_amanakis at yahoo.com>
Cc: Dave Airlie <airlied at redhat.com>
Cc: stable at vger.kernel.org (for 3.8)
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 drivers/gpu/drm/drm_crtc_helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 7b2d378..3260736 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -1067,7 +1067,7 @@ void 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;
 
 	mutex_lock(&dev->mode_config.mutex);
-- 
1.7.10.4