aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2009-06-05 03:38:43 -0400
committerEric Anholt <eric@anholt.net>2009-06-05 07:35:17 -0400
commit30ad48b7334a2eb2edf22f6c91f7b3f22a22a837 (patch)
tree01efd9f1172ca1c7820c7c4f0830e599e5da1ce7 /drivers/gpu/drm/i915/intel_display.c
parent2c07245fb8f7f0a282282e5a9747e46defdb2cc7 (diff)
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.c17
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 2cd6ba6523d8..53cf6efa67b6 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)
2432 intel_lvds_init(dev); 2432 intel_lvds_init(dev);
2433 2433
2434 if (IS_IGDNG(dev)) { 2434 if (IS_IGDNG(dev)) {
2435 /* ignore for other outputs */ 2435 int found;
2436
2437 if (I915_READ(HDMIB) & PORT_DETECTED) {
2438 /* check SDVOB */
2439 /* found = intel_sdvo_init(dev, HDMIB); */
2440 found = 0;
2441 if (!found)
2442 intel_hdmi_init(dev, HDMIB);
2443 }
2444
2445 if (I915_READ(HDMIC) & PORT_DETECTED)
2446 intel_hdmi_init(dev, HDMIC);
2447
2448 if (I915_READ(HDMID) & PORT_DETECTED)
2449 intel_hdmi_init(dev, HDMID);
2450
2436 } else if (IS_I9XX(dev)) { 2451 } else if (IS_I9XX(dev)) {
2437 int found; 2452 int found;
2438 u32 reg; 2453 u32 reg;