aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-23 14:23:38 -0400
committerDave Airlie <airlied@redhat.com>2012-11-20 01:06:12 -0500
commit11e686855c81c2e5e647b3dcfabd2a4e473c46f0 (patch)
tree4bd3ea450d2beb7f779b936073e1e146a1d0a66d
parent905bc9ff6575f78aab24c0261e8785425b5a0397 (diff)
drm: don't poll forced connectors
Otherwise if the detect callback reports a different state than what the user forced (rather likely), we continously annoy userspace about a hotplug uevent. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 5ee192885c97..6437bb9ed81c 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -965,6 +965,10 @@ static void output_poll_execute(struct work_struct *work)
965 mutex_lock(&dev->mode_config.mutex); 965 mutex_lock(&dev->mode_config.mutex);
966 list_for_each_entry(connector, &dev->mode_config.connector_list, head) { 966 list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
967 967
968 /* Ignore forced connectors. */
969 if (connector->force)
970 continue;
971
968 /* Ignore HPD capable connectors and connectors where we don't 972 /* Ignore HPD capable connectors and connectors where we don't
969 * want any hotplug detection at all for polling. */ 973 * want any hotplug detection at all for polling. */
970 if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD) 974 if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)