From 06676f72fdb981533b66090647d57f745666afd7 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 23 Oct 2012 18:23:38 +0000 Subject: [PATCH] --- yaml --- r: 345321 b: refs/heads/master c: 11e686855c81c2e5e647b3dcfabd2a4e473c46f0 h: refs/heads/master i: 345319: bde433f571d7dcdbb96e4924a2d1e06abdcc8a5c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d06f25b0ab79..5273cceaf13e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 905bc9ff6575f78aab24c0261e8785425b5a0397 +refs/heads/master: 11e686855c81c2e5e647b3dcfabd2a4e473c46f0 diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c index 5ee192885c97..6437bb9ed81c 100644 --- a/trunk/drivers/gpu/drm/drm_crtc_helper.c +++ b/trunk/drivers/gpu/drm/drm_crtc_helper.c @@ -965,6 +965,10 @@ static void output_poll_execute(struct work_struct *work) mutex_lock(&dev->mode_config.mutex); list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + /* Ignore forced connectors. */ + if (connector->force) + continue; + /* Ignore HPD capable connectors and connectors where we don't * want any hotplug detection at all for polling. */ if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)