drm/gma500: Add chip specific sdvo masks

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>

5 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 162f686c532d..5a9a6a3063a8 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -634,6 +634,7 @@ const struct psb_ops cdv_chip_ops = {
         .crtcs = 2,
         .hdmi_mask = (1 << 0) | (1 << 1),
         .lvds_mask = (1 << 1),
+        .sdvo_mask = (1 << 0),
         .cursor_needs_phys = 0,
         .sgx_offset = MRST_SGX_OFFSET,
         .chip_setup = cdv_chip_setup,
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 01dd7d225762..94b3fec22c28 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -714,7 +714,7 @@ static void psb_setup_outputs(struct drm_device *dev)
                         clone_mask = (1 << INTEL_OUTPUT_ANALOG);
                         break;
                 case INTEL_OUTPUT_SDVO:
-                        crtc_mask = ((1 << 0) | (1 << 1));
+                        crtc_mask = dev_priv->ops->sdvo_mask;
                         clone_mask = (1 << INTEL_OUTPUT_SDVO);
                         break;
                 case INTEL_OUTPUT_LVDS:
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index 08747fd7105c..80798517d93e 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -546,6 +546,7 @@ const struct psb_ops oaktrail_chip_ops = {
         .crtcs = 2,
         .hdmi_mask = (1 << 1),
         .lvds_mask = (1 << 0),
+        .sdvo_mask = (1 << 1),
         .cursor_needs_phys = 0,
         .sgx_offset = MRST_SGX_OFFSET,
 
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index 697678619bd1..23fb33f1471b 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -373,6 +373,7 @@ const struct psb_ops psb_chip_ops = {
         .crtcs = 2,
         .hdmi_mask = (1 << 0),
         .lvds_mask = (1 << 1),
+        .sdvo_mask = (1 << 0),
         .cursor_needs_phys = 1,
         .sgx_offset = PSB_SGX_OFFSET,
         .chip_setup = psb_chip_setup,
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index b26d029a2e81..fd93756f41d1 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -672,6 +672,7 @@ struct psb_ops {
         int sgx_offset;         /* Base offset of SGX device */
         int hdmi_mask;          /* Mask of HDMI CRTCs */
         int lvds_mask;          /* Mask of LVDS CRTCs */
+        int sdvo_mask;          /* Mask of SDVO CRTCs */
         int cursor_needs_phys;  /* If cursor base reg need physical address */
 
         /* Sub functions */