aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Holzmayr <holzmayr@rsi-elektrotechnik.de>2015-04-16 08:16:29 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-04-20 12:38:58 -0400
commita3c6d686443e912e33cebdf9cd80f94df3ded7b0 (patch)
tree2ca85dc48a16ca17ad1b354ef39912c6b0a780bb
parent396aa4451e865d1e36d6d4e0686a9303c038b606 (diff)
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 <holzmayr@rsi-elektrotechnik.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/drm_probe_helper.c4
1 files changed, 2 insertions, 2 deletions
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)
322 if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD) 322 if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)
323 continue; 323 continue;
324 324
325 repoll = true;
326
327 old_status = connector->status; 325 old_status = connector->status;
328 /* if we are connected and don't want to poll for disconnect 326 /* if we are connected and don't want to poll for disconnect
329 skip it */ 327 skip it */
@@ -331,6 +329,8 @@ static void output_poll_execute(struct work_struct *work)
331 !(connector->polled & DRM_CONNECTOR_POLL_DISCONNECT)) 329 !(connector->polled & DRM_CONNECTOR_POLL_DISCONNECT))
332 continue; 330 continue;
333 331
332 repoll = true;
333
334 connector->status = connector->funcs->detect(connector, false); 334 connector->status = connector->funcs->detect(connector, false);
335 if (old_status != connector->status) { 335 if (old_status != connector->status) {
336 const char *old, *new; 336 const char *old, *new;