diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2010-01-27 09:32:46 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-01-29 23:35:32 +0100 |
| commit | 2dd873838805a6e84c1afdfbf13e8709bfb5c70f (patch) | |
| tree | 311f15cfad3350aecb0be049955518a4c5042f26 /drivers | |
| parent | drm/i915: don't trigger ironlake vblank interrupt at irq install (diff) | |
| download | linux-2dd873838805a6e84c1afdfbf13e8709bfb5c70f.tar.xz linux-2dd873838805a6e84c1afdfbf13e8709bfb5c70f.zip | |
drm/i915: Add support for SDVO composite TV
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index eaacfd0920df..82678d30ab06 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -2345,6 +2345,14 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags) connector->connector_type = DRM_MODE_CONNECTOR_VGA; intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) | (1 << INTEL_ANALOG_CLONE_BIT); + } else if (flags & SDVO_OUTPUT_CVBS0) { + + sdvo_priv->controlled_output = SDVO_OUTPUT_CVBS0; + encoder->encoder_type = DRM_MODE_ENCODER_TVDAC; + connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO; + sdvo_priv->is_tv = true; + intel_output->needs_tv_clock = true; + intel_output->clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT; } else if (flags & SDVO_OUTPUT_LVDS0) { sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0; |