summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500/cdv_device.c
diff options
context:
space:
mode:
authorAlan Cox2012-08-08 15:55:26 +0200
committerDave Airlie2012-08-24 01:29:19 +0200
commit35659715c42b5cd148935e8ebd4e5e8e4e256b96 (patch)
tree6ea2a945cd4e040c731d36244ad7fd02aa2277a4 /drivers/gpu/drm/gma500/cdv_device.c
parentgma500/cdv: sync up and add the displayport code to the build (diff)
downloadkernel-qcow2-linux-35659715c42b5cd148935e8ebd4e5e8e4e256b96.tar.gz
kernel-qcow2-linux-35659715c42b5cd148935e8ebd4e5e8e4e256b96.tar.xz
kernel-qcow2-linux-35659715c42b5cd148935e8ebd4e5e8e4e256b96.zip
gma500/cdv: enable the DisplayPort support
This will give the basic support only Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/cdv_device.c')
-rw-r--r--drivers/gpu/drm/gma500/cdv_device.c11
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)
cdv_intel_lvds_init(dev, &dev_priv->mode_dev);
/* These bits indicate HDMI not SDVO on CDV */
- if (REG_READ(SDVOB) & SDVO_DETECTED)
+ if (REG_READ(SDVOB) & SDVO_DETECTED) {
cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOB);
- if (REG_READ(SDVOC) & SDVO_DETECTED)
+ if (REG_READ(DP_B) & DP_DETECTED)
+ cdv_intel_dp_init(dev, &dev_priv->mode_dev, DP_B);
+ }
+
+ if (REG_READ(SDVOC) & SDVO_DETECTED) {
cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOC);
+ if (REG_READ(DP_C) & DP_DETECTED)
+ cdv_intel_dp_init(dev, &dev_priv->mode_dev, DP_C);
+ }
return 0;
}