From 168c9bc0a8e24401e5fb938c574d161a219e5455 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:44:20 +0100 Subject: [PATCH] --- yaml --- r: 259699 b: refs/heads/master c: a11c3ec7e9565bd8aad41a151b1d05c271d859e9 h: refs/heads/master i: 259697: 2f990b80b3da845ce825d17a3dbf74760c75fcee 259695: 5732581042a9365073d1f0c2432ea212578bab3d v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/Makefile | 3 ++- trunk/drivers/staging/gma500/cdv_device.c | 4 ++-- trunk/drivers/staging/gma500/psb_intel_drv.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 07987551b363..24edded9c1b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93b68b67739d40346756fe9b7423f084a1b22bce +refs/heads/master: a11c3ec7e9565bd8aad41a151b1d05c271d859e9 diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile index 507aaafa3396..e515edfb1d27 100644 --- a/trunk/drivers/staging/gma500/Makefile +++ b/trunk/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/trunk/drivers/staging/gma500/cdv_device.c b/trunk/drivers/staging/gma500/cdv_device.c index 622c955cd5c1..680f1bbf0766 100644 --- a/trunk/drivers/staging/gma500/cdv_device.c +++ b/trunk/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/trunk/drivers/staging/gma500/psb_intel_drv.h b/trunk/drivers/staging/gma500/psb_intel_drv.h index 9d7151a3bb10..36b554b5c335 100644 --- a/trunk/drivers/staging/gma500/psb_intel_drv.h +++ b/trunk/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 {