From: Josef Holzmayr Date: Thu, 16 Apr 2015 12:16:29 +0000 (+0200) Subject: DRM: Don't re-poll connector for disconnect X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a3c6d686443e912e33cebdf9cd80f94df3ded7b0;p=deliverable%2Flinux.git DRM: Don't re-poll connector for disconnect DRM probe should not repoll a connector if it is already connected and the DRM_CONNECTOR_POLL_DISCONNECT flag is not set. Signed-off-by: Josef Holzmayr Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index d44437fc42b1..2fb2fbe8c2de 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -322,8 +322,6 @@ static void output_poll_execute(struct work_struct *work) if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD) continue; - repoll = true; - old_status = connector->status; /* if we are connected and don't want to poll for disconnect skip it */ @@ -331,6 +329,8 @@ static void output_poll_execute(struct work_struct *work) !(connector->polled & DRM_CONNECTOR_POLL_DISCONNECT)) continue; + repoll = true; + connector->status = connector->funcs->detect(connector, false); if (old_status != connector->status) { const char *old, *new;