Browse Source

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>
Josef Holzmayr 10 years ago
parent
commit
a3c6d68644
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/gpu/drm/drm_probe_helper.c

+ 2 - 2
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)
 		if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)
 			continue;
 			continue;
 
 
-		repoll = true;
-
 		old_status = connector->status;
 		old_status = connector->status;
 		/* if we are connected and don't want to poll for disconnect
 		/* if we are connected and don't want to poll for disconnect
 		   skip it */
 		   skip it */
@@ -331,6 +329,8 @@ static void output_poll_execute(struct work_struct *work)
 		    !(connector->polled & DRM_CONNECTOR_POLL_DISCONNECT))
 		    !(connector->polled & DRM_CONNECTOR_POLL_DISCONNECT))
 			continue;
 			continue;
 
 
+		repoll = true;
+
 		connector->status = connector->funcs->detect(connector, false);
 		connector->status = connector->funcs->detect(connector, false);
 		if (old_status != connector->status) {
 		if (old_status != connector->status) {
 			const char *old, *new;
 			const char *old, *new;