diff options
-rw-r--r-- | drivers/gpu/drm/gma500/cdv_device.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c index e2fff244a599..68f100e67135 100644 --- a/drivers/gpu/drm/gma500/cdv_device.c +++ b/drivers/gpu/drm/gma500/cdv_device.c | |||
@@ -58,10 +58,17 @@ static int cdv_output_init(struct drm_device *dev) | |||
58 | cdv_intel_lvds_init(dev, &dev_priv->mode_dev); | 58 | cdv_intel_lvds_init(dev, &dev_priv->mode_dev); |
59 | 59 | ||
60 | /* These bits indicate HDMI not SDVO on CDV */ | 60 | /* These bits indicate HDMI not SDVO on CDV */ |
61 | if (REG_READ(SDVOB) & SDVO_DETECTED) | 61 | if (REG_READ(SDVOB) & SDVO_DETECTED) { |
62 | cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOB); | 62 | cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOB); |
63 | if (REG_READ(SDVOC) & SDVO_DETECTED) | 63 | if (REG_READ(DP_B) & DP_DETECTED) |
64 | cdv_intel_dp_init(dev, &dev_priv->mode_dev, DP_B); | ||
65 | } | ||
66 | |||
67 | if (REG_READ(SDVOC) & SDVO_DETECTED) { | ||
64 | cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOC); | 68 | cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOC); |
69 | if (REG_READ(DP_C) & DP_DETECTED) | ||
70 | cdv_intel_dp_init(dev, &dev_priv->mode_dev, DP_C); | ||
71 | } | ||
65 | return 0; | 72 | return 0; |
66 | } | 73 | } |
67 | 74 | ||