diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-06-05 15:38:43 +0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-06-05 11:35:17 +0000 |
commit | 30ad48b7334a2eb2edf22f6c91f7b3f22a22a837 (patch) | |
tree | 01efd9f1172ca1c7820c7c4f0830e599e5da1ce7 /drivers/gpu/drm/i915/intel_display.c | |
parent | 2c07245fb8f7f0a282282e5a9747e46defdb2cc7 (diff) | |
download | op-kernel-dev-30ad48b7334a2eb2edf22f6c91f7b3f22a22a837.zip op-kernel-dev-30ad48b7334a2eb2edf22f6c91f7b3f22a22a837.tar.gz |
drm/i915: Add HDMI support on IGDNG
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2cd6ba6..53cf6ef 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2432,7 +2432,22 @@ static void intel_setup_outputs(struct drm_device *dev) intel_lvds_init(dev); if (IS_IGDNG(dev)) { - /* ignore for other outputs */ + int found; + + if (I915_READ(HDMIB) & PORT_DETECTED) { + /* check SDVOB */ + /* found = intel_sdvo_init(dev, HDMIB); */ + found = 0; + if (!found) + intel_hdmi_init(dev, HDMIB); + } + + if (I915_READ(HDMIC) & PORT_DETECTED) + intel_hdmi_init(dev, HDMIC); + + if (I915_READ(HDMID) & PORT_DETECTED) + intel_hdmi_init(dev, HDMID); + } else if (IS_I9XX(dev)) { int found; u32 reg; |