---

yaml --- r: 310633 b: refs/heads/master c: 8f53369 h: refs/heads/master i: 310631: 0677786 v: v3
git-mirror · Jun 8, 2012 · f08e4d8 · f08e4d8
1 parent 7499b89
commit f08e4d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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))