Commit cf8efd3a authored by Patrik Jakobsson's avatar Patrik Jakobsson

drm/gma500: Add chip specific sdvo masks

Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent 9d3e2f53
...@@ -634,6 +634,7 @@ const struct psb_ops cdv_chip_ops = { ...@@ -634,6 +634,7 @@ const struct psb_ops cdv_chip_ops = {
.crtcs = 2, .crtcs = 2,
.hdmi_mask = (1 << 0) | (1 << 1), .hdmi_mask = (1 << 0) | (1 << 1),
.lvds_mask = (1 << 1), .lvds_mask = (1 << 1),
.sdvo_mask = (1 << 0),
.cursor_needs_phys = 0, .cursor_needs_phys = 0,
.sgx_offset = MRST_SGX_OFFSET, .sgx_offset = MRST_SGX_OFFSET,
.chip_setup = cdv_chip_setup, .chip_setup = cdv_chip_setup,
......
...@@ -714,7 +714,7 @@ static void psb_setup_outputs(struct drm_device *dev) ...@@ -714,7 +714,7 @@ static void psb_setup_outputs(struct drm_device *dev)
clone_mask = (1 << INTEL_OUTPUT_ANALOG); clone_mask = (1 << INTEL_OUTPUT_ANALOG);
break; break;
case INTEL_OUTPUT_SDVO: case INTEL_OUTPUT_SDVO:
crtc_mask = ((1 << 0) | (1 << 1)); crtc_mask = dev_priv->ops->sdvo_mask;
clone_mask = (1 << INTEL_OUTPUT_SDVO); clone_mask = (1 << INTEL_OUTPUT_SDVO);
break; break;
case INTEL_OUTPUT_LVDS: case INTEL_OUTPUT_LVDS:
......
...@@ -546,6 +546,7 @@ const struct psb_ops oaktrail_chip_ops = { ...@@ -546,6 +546,7 @@ const struct psb_ops oaktrail_chip_ops = {
.crtcs = 2, .crtcs = 2,
.hdmi_mask = (1 << 1), .hdmi_mask = (1 << 1),
.lvds_mask = (1 << 0), .lvds_mask = (1 << 0),
.sdvo_mask = (1 << 1),
.cursor_needs_phys = 0, .cursor_needs_phys = 0,
.sgx_offset = MRST_SGX_OFFSET, .sgx_offset = MRST_SGX_OFFSET,
......
...@@ -373,6 +373,7 @@ const struct psb_ops psb_chip_ops = { ...@@ -373,6 +373,7 @@ const struct psb_ops psb_chip_ops = {
.crtcs = 2, .crtcs = 2,
.hdmi_mask = (1 << 0), .hdmi_mask = (1 << 0),
.lvds_mask = (1 << 1), .lvds_mask = (1 << 1),
.sdvo_mask = (1 << 0),
.cursor_needs_phys = 1, .cursor_needs_phys = 1,
.sgx_offset = PSB_SGX_OFFSET, .sgx_offset = PSB_SGX_OFFSET,
.chip_setup = psb_chip_setup, .chip_setup = psb_chip_setup,
......
...@@ -672,6 +672,7 @@ struct psb_ops { ...@@ -672,6 +672,7 @@ struct psb_ops {
int sgx_offset; /* Base offset of SGX device */ int sgx_offset; /* Base offset of SGX device */
int hdmi_mask; /* Mask of HDMI CRTCs */ int hdmi_mask; /* Mask of HDMI CRTCs */
int lvds_mask; /* Mask of LVDS 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 */ int cursor_needs_phys; /* If cursor base reg need physical address */
/* Sub functions */ /* Sub functions */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment