Attachment 32863 Details for Bug 25787 – Detet SDVO-VGA before SDVO-TV for multi-function SDVO card

[patch] Detet SDVO-VGA before SDVO-TV for multi-function SDVO card

0001-drm-i915-Detect-SDVO-RGB-before-SDVO-TV.patch (text/plain), 2.13 KB, created by ykzhao on 2010-01-27 19:40:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ykzhao

Created: 2010-01-27 19:40:58 UTC

Size: 2.13 KB

patch

obsolete

>From f1d35749b4ae9cf7925f7e522d076383dc670594 Mon Sep 17 00:00:00 2001
>From: Zhao Yakui <yakui.zhao@intel.com>
>Date: Wed, 27 Jan 2010 16:17:58 +0800
>Subject: [PATCH 1/2] drm/i915: Detect SDVO-RGB before SDVO TV
>
>Some VGA/TV dual function SDVO card  with only VGA port incorrectly report all
>kinds of its connection as connected when VGA monitor is connected.
>This patch workaround it.
>
>http://bugs.freedesktop.org/show_bug.cgi?id=25787
>
>Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
>---
>This is the last few missing deltas found in UMS code during code clean up.
>
> drivers/gpu/drm/i915/intel_sdvo.c |   16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index eaacfd0..1114f93 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -2323,14 +2323,6 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
> 					(1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
> 					(1 << INTEL_ANALOG_CLONE_BIT);
> 		}
>-	} else if (flags & SDVO_OUTPUT_SVID0) {
>-
>-		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
>-		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_RGB0) {
> 
> 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
>@@ -2345,6 +2337,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_SVID0) {
>+
>+		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
>+		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;
>-- 
>1.5.4.5
>

Actions: View | Splinter Review

Attachments on bug 25787: 32273 | 32274 | 32275 | 32276 | 32339 | 32490 | 32491 | 32620 | 32649 | 32863 | 32988 | 32989 | 33021 | 33022 | 33046 | 33047 | 33048 | 33052 | 33053 | 33085 | 33089 | 33090 | 33099 | 33151 | 33682 | 33704 | 33705 | 33706

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.