gma500: Add the HDMI bits

This adds the basic HDMI support for Cedarview.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index 507aaafa3396c44f373599821029dd17ee444b04..e515edfb1d27204392dff95377edd0da6dbd2f1e 100644 (file)
--- a/drivers/staging/gma500/Makefile
+++ b/drivers/staging/gma500/Makefile
@@ -25,8 +25,9 @@ psb_gfx-y += gem_glue.o \
          mid_bios.o
 
 psb_gfx-$(CONFIG_DRM_PSB_CDV) +=  cdv_device.o \
-         cdv_intel_display.o \
          cdv_intel_crt.o \
+         cdv_intel_display.o \
+         cdv_intel_hdmi.o \
          cdv_intel_lvds.o
 
 psb_gfx-$(CONFIG_DRM_PSB_MRST) += mrst_device.o \

diff --git a/drivers/staging/gma500/cdv_device.c b/drivers/staging/gma500/cdv_device.c
index 622c955cd5c1e7de3c73f8f1ff69ce1db2e49b5e..680f1bbf076657bbf93427e812dee0d2d6e48e24 100644 (file)
--- a/drivers/staging/gma500/cdv_device.c
+++ b/drivers/staging/gma500/cdv_device.c
@@ -58,9 +58,9 @@ static int cdv_output_init(struct drm_device *dev)
        /* These bits indicate HDMI not SDVO on CDV, but we don't yet support
           the HDMI interface */
        if (REG_READ(SDVOB) & SDVO_DETECTED)
-               DRM_ERROR("HDMI not supported yet\n");
+               cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOB);
        if (REG_READ(SDVOC) & SDVO_DETECTED)
-               DRM_ERROR("HDMI not supported yet\n");
+               cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOC);
        return 0;
 }
 

diff --git a/drivers/staging/gma500/psb_intel_drv.h b/drivers/staging/gma500/psb_intel_drv.h
index 9d7151a3bb10b9d565cfdbdd922c533f9f5460d4..36b554b5c335fe54a9ac0ad993367045b5d365ed 100644 (file)
--- a/drivers/staging/gma500/psb_intel_drv.h
+++ b/drivers/staging/gma500/psb_intel_drv.h
@@ -105,7 +105,7 @@ struct psb_intel_output {
        void *dev_priv;
 
        struct psb_intel_mode_device *mode_dev;
-
+       struct i2c_adapter *hdmi_i2c_adapter;   /* for control functions */
 };
 
 struct psb_intel_crtc_state {