summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-07 00:53:47 +0200
committerDave Airlie <airlied@redhat.com>2010-09-13 12:21:12 +0200
commit551402a30efa45560e23c22a7aa04453861602c3 (patch)
treeb343d96ec1482812bf7229cc12455c0e11db590e
parentLinux 2.6.36-rc4 (diff)
downloadlinux-551402a30efa45560e23c22a7aa04453861602c3.tar.xz
linux-551402a30efa45560e23c22a7aa04453861602c3.zip
drm: Fix regression in disable polling e58f637
I broke out my trusty i845 and found a new boot failure, which upon inspection turned out to be a recursion within: drm_helper_probe_single_connector_modes() -> drm_helper_hpd_irq_event() -> intel_crt_detect() -> drm_helper_probe_single_connector_modes() Calling drm_kms_helper_poll_enable() instead performs the desired re-initialisation of the polling should the user have toggled the parameter, without the recursive side-effect. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index d2ab01e90a96..4238a19c36db 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -104,7 +104,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
connector->funcs->force(connector);
} else {
connector->status = connector->funcs->detect(connector);
- drm_helper_hpd_irq_event(dev);
+ drm_kms_helper_poll_enable(dev);
}
if (connector->status == connector_status_disconnected) {