---

yaml --- r: 168903 b: refs/heads/master c: 8e9e0ee h: refs/heads/master i: 168901: f322789 168899: 5d58eb2 168895: ad30c48 v: v3
git-mirror · Nov 25, 2009 · de018ff · de018ff
1 parent f928902
commit de018ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cf1e35cb025eaa52dde37df38e2750b6adb1620
+refs/heads/master: 8e9e0eea9955bffbe5e5cd6355157cabddc31f17
diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c
@@ -262,8 +262,8 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
 		} while (time_after(timeout, jiffies));
 	}
 
-	if ((I915_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) ==
-	    CRT_HOTPLUG_MONITOR_COLOR)
+	if ((I915_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) !=
+	    CRT_HOTPLUG_MONITOR_NONE)
 		return true;
 
 	return false;