diff options
| author | Zhao Yakui | 2010-03-30 09:11:33 +0200 |
|---|---|---|
| committer | Eric Anholt | 2010-04-12 18:24:11 +0200 |
| commit | 461ed3caee9b615393eb5beb9a8148d230354b41 (patch) | |
| tree | 33fb06d5c9b021f8a10fae0c61a094d655778eaa /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on). (diff) | |
| download | kernel-qcow2-linux-461ed3caee9b615393eb5beb9a8148d230354b41.tar.gz kernel-qcow2-linux-461ed3caee9b615393eb5beb9a8148d230354b41.tar.xz kernel-qcow2-linux-461ed3caee9b615393eb5beb9a8148d230354b41.zip | |
drm/i915: Add support of SDVO on Ibexpeak PCH
SDVO on Ibexpeak PCH with Ironlake is multiplexed with
HDMIB port, and only has SDVOB port.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 243dfb80cd92..32a248987867 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4670,9 +4670,8 @@ static void intel_setup_outputs(struct drm_device *dev) intel_dp_init(dev, DP_A); if (I915_READ(HDMIB) & PORT_DETECTED) { - /* check SDVOB */ - /* found = intel_sdvo_init(dev, HDMIB); */ - found = 0; + /* PCH SDVOB multiplex with HDMIB */ + found = intel_sdvo_init(dev, PCH_SDVOB); if (!found) intel_hdmi_init(dev, HDMIB); if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED)) |