Attachment 43173 Details for Bug 34101 – Use the EDID to confirm the connection status

[patch] Use the EDID to confirm the connection status

0001-drm-i915-sdvo-If-we-have-an-EDID-confirm-it-matches-.patch (text/plain), 2.77 KB, created by Chris Wilson on 2011-02-09 12:07:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-02-09 12:07:27 UTC

Size: 2.77 KB

patch

obsolete

>From 316d8aa8b42a91fc34d73d541c1c2985cc504aa0 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 9 Feb 2011 20:01:16 +0000
>Subject: [PATCH] drm/i915/sdvo: If we have an EDID confirm it matches the mode of the connection
>
>If we have an EDID for a digital panel, but we are probing a non-TMDS
>connector then we know that this is a false detection, and vice versa.
>This should reduce the number of bogus outputs on multi-function
>adapters that report the same output on multiple connectors.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34101
>Reported-by: Sebastien Caty <sebastien.caty@mrnf.gouv.qc.ca>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_sdvo.c |   27 ++++++++++++++++++++++++---
> 1 files changed, 24 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index 3e09caa..7bae541 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -46,6 +46,7 @@
>                          SDVO_TV_MASK)
> 
> #define IS_TV(c)	(c->output_flag & SDVO_TV_MASK)
>+#define IS_TMDS(c)	(c->output_flag & SDVO_TMDS_MASK)
> #define IS_LVDS(c)	(c->output_flag & SDVO_LVDS_MASK)
> #define IS_TV_OR_LVDS(c) (c->output_flag & (SDVO_TV_MASK | SDVO_LVDS_MASK))
> 
>@@ -1409,8 +1410,23 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
> 		ret = connector_status_disconnected;
> 	else if (response & SDVO_TMDS_MASK)
> 		ret = intel_sdvo_hdmi_sink_detect(connector);
>-	else
>-		ret = connector_status_connected;
>+	else {
>+		struct edid *edid;
>+
>+		/* if we have an edid check it matches the connection */
>+		edid = intel_sdvo_get_edid(connector);
>+		if (edid == NULL)
>+			edid = intel_sdvo_get_analog_edid(connector);
>+		if (edid != NULL) {
>+			if (edid->input & DRM_EDID_INPUT_DIGITAL)
>+				ret = connector_status_disconnected;
>+			else
>+				ret = connector_status_connected;
>+			connector->display_info.raw_edid = NULL;
>+			kfree(edid);
>+		} else
>+			ret = connector_status_connected;
>+	}
> 
> 	/* May update encoder flag for like clock for SDVO TV, etc.*/
> 	if (ret == connector_status_connected) {
>@@ -1446,10 +1462,15 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> 		edid = intel_sdvo_get_analog_edid(connector);
> 
> 	if (edid != NULL) {
>-		if (edid->input & DRM_EDID_INPUT_DIGITAL) {
>+		struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
>+		bool monitor_is_digital = !!(edid->input & DRM_EDID_INPUT_DIGITAL);
>+		bool connector_is_digital = !!IS_TMDS(intel_sdvo_connector);
>+
>+		if (connector_is_digital == monitor_is_digital) {
> 			drm_mode_connector_update_edid_property(connector, edid);
> 			drm_add_edid_modes(connector, edid);
> 		}
>+
> 		connector->display_info.raw_edid = NULL;
> 		kfree(edid);
> 	}
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 34101: 43172 | 43173 | 43175 | 43176 | 43177

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.