---

yaml
---
r: 318595
b: refs/heads/master
c: aaa3773
h: refs/heads/master
i:
  318593: b54cb7b
  318591: d85e516
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e96d9c4d9843f00ebeb4a9b33596d96602ea101
+refs/heads/master: aaa377302b2994fcc2c66741b47da33feb489dca

trunk/drivers/gpu/drm/i915/intel_crt.c

@@ -453,18 +453,27 @@ 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))
 		return connector_status_connected;
 
+	/* Load detection is broken on HPD capable machines. Whoever wants a
+	 * broken monitor (without edid) to work behind a broken kvm (that fails
+	 * to have the right resistors for HP detection) needs to fix this up.
+	 * For now just bail out. */
+	if (I915_HAS_HOTPLUG(dev))
+		return connector_status_disconnected;
+
 	if (!force)
 		return connector->status;