Commit 8e9e0eea authored Nov 11, 2009 by Zhenyu Wang Committed by Eric Anholt Nov 25, 2009

drm/i915: Fix CRT hotplug detect by checking really no channels attached

For CRT hotplug detect status, we have four test results as blue
channel only, green channel only, both blue and green channel, and
no channel attached. Origin code only marks both blue and green channel
case as connected, but ignore other possible connected states. This one
trys to detect CRT by checking no channel attached case instead.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

parent 9cf1e35c

drivers/gpu/drm/i915/intel_crt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message