diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-05 15:44:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 08:20:44 -0700 |
| commit | a11c3ec7e9565bd8aad41a151b1d05c271d859e9 (patch) | |
| tree | 84b059eaa199e1d85f67f0cd2a628912c9332e94 /drivers | |
| parent | 93b68b67739d40346756fe9b7423f084a1b22bce (diff) | |
| download | lwn-a11c3ec7e9565bd8aad41a151b1d05c271d859e9.tar.gz lwn-a11c3ec7e9565bd8aad41a151b1d05c271d859e9.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/gma500/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/gma500/cdv_device.c | 4 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_intel_drv.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile index 507aaafa3396..e515edfb1d27 100644 --- 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 622c955cd5c1..680f1bbf0766 100644 --- 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 9d7151a3bb10..36b554b5c335 100644 --- 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 { |