From f08e4d86d1b75f3805409c6a9da456bcb1a5fb1a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 8 Jun 2012 14:53:06 -0700 Subject: [PATCH] --- yaml --- r: 310633 b: refs/heads/master c: 8f53369b753f5f4c7684c2eb0b592152abb1dd00 h: refs/heads/master i: 310631: 0677786a3d52c82497e9e6219a1d06fbb562035a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 92be60a1f0db..99f8e99c6a88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77249539cd987884f86df6fd5c43b3dae1841be1 +refs/heads/master: 8f53369b753f5f4c7684c2eb0b592152abb1dd00 diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c index 844e93e1e395..75a70c46ef1b 100644 --- a/trunk/drivers/gpu/drm/i915/intel_crt.c +++ b/trunk/drivers/gpu/drm/i915/intel_crt.c @@ -453,15 +453,13 @@ intel_crt_detect(struct drm_connector *connector, bool force) struct intel_load_detect_pipe tmp; if (I915_HAS_HOTPLUG(dev)) { - /* We can not rely on the HPD pin always being correctly wired - * up, for example many KVM do not pass it through, and so - * only trust an assertion that the monitor is connected. - */ if (intel_crt_detect_hotplug(connector)) { DRM_DEBUG_KMS("CRT detected via hotplug\n"); return connector_status_connected; - } else + } else { DRM_DEBUG_KMS("CRT not detected via hotplug\n"); + return connector_status_disconnected; + } } if (intel_crt_detect_ddc(connector))