diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2007-12-04 15:36:36 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@aurora.(none)> | 2007-12-18 02:21:08 +0100 |
| commit | e239882b1e90cba0297118ec7dc432bea06b0bd0 (patch) | |
| tree | 79516ad9a1e9ba8f5447ca9532fb3576cf6ac5ec /linux-core/intel_crt.c | |
| parent | f62a300547b1f495472f773587cd20c6c9da06aa (diff) | |
Modesetting Hotplug
Diffstat (limited to 'linux-core/intel_crt.c')
| -rw-r--r-- | linux-core/intel_crt.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux-core/intel_crt.c b/linux-core/intel_crt.c index 722a62c8..864b1a25 100644 --- a/linux-core/intel_crt.c +++ b/linux-core/intel_crt.c @@ -142,6 +142,7 @@ static bool intel_crt_detect_hotplug(struct drm_output *output) struct drm_device *dev = output->dev; struct drm_i915_private *dev_priv = dev->dev_private; u32 temp; +#if 1 unsigned long timeout = jiffies + msecs_to_jiffies(1000); temp = I915_READ(PORT_HOTPLUG_EN); @@ -160,6 +161,15 @@ static bool intel_crt_detect_hotplug(struct drm_output *output) return true; return false; +#else + temp = I915_READ(PORT_HOTPLUG_STAT); + DRM_DEBUG("HST 0x%08x\n", temp); + + if (temp & (1 << 8) && temp & (1 << 9)) + return true; + + return false; +#endif } static bool intel_crt_detect_ddc(struct drm_output *output) |