diff options
| author | Josef Holzmayr <holzmayr@rsi-elektrotechnik.de> | 2015-04-16 14:16:29 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-20 18:38:58 +0200 |
| commit | a3c6d686443e912e33cebdf9cd80f94df3ded7b0 (patch) | |
| tree | 2ca85dc48a16ca17ad1b354ef39912c6b0a780bb | |
| parent | drm: Fix for DP CTS test 4.2.2.5 - I2C DEFER handling (diff) | |
| download | linux-a3c6d686443e912e33cebdf9cd80f94df3ded7b0.tar.xz linux-a3c6d686443e912e33cebdf9cd80f94df3ded7b0.zip | |
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.c | 4 |
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) 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; |