From de018ff0c4842203077167cb3883398429b9ffe9 Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Wed, 11 Nov 2009 02:30:50 +0000
Subject: [PATCH] --- yaml --- r: 168903 b: refs/heads/master c:
 8e9e0eea9955bffbe5e5cd6355157cabddc31f17 h: refs/heads/master i:   168901:
 f322789c0e40f536be2c40012ed4ed6153e26eab   168899:
 5d58eb2909a692cd117a40b9c56b38dfe3683fca   168895:
 ad30c483eb35dcff1a7f3147b5d9fad3f0f1077c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/i915/intel_crt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d169a81a41b8..5411871eb757 100644
--- 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
index 212e22740fc1..e5051446c48e 100644
--- 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;