Attachment 49069 Details for Bug 39216 – LVDS panels are digital as well!

[patch] LVDS panels are digital as well!

0001-drm-i915-sdvo-Include-LVDS-panels-for-the-IS_DIGITAL.patch (text/plain), 3.05 KB, created by Chris Wilson on 2011-07-14 01:28:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-07-14 01:28:25 UTC

Size: 3.05 KB

patch

obsolete

>From 64015d6d16d7ed5b6ffcec95dc13e8694bd2a4d6 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 20 Jun 2011 22:35:24 +0100
>Subject: [PATCH] drm/i915/sdvo: Include LVDS panels for the IS_DIGITAL check
>
>We were checking whether the supplied edid matched the connector it was
>read from. We do this in case a DDC read returns an EDID for another
>device on a multifunction or otherwise interesting card. However, we
>failed to include LVDS as a digital device and so rejecting an otherwise
>valid EDID.
>
>Fixes the detection of the secondary SDVO LVDS panel on the Libretto
>W105.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_sdvo.c |   28 ++++++++++++++++++++--------
> 1 files changed, 20 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index f96975c..26eff9f 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -49,6 +49,7 @@
> #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))
>+#define IS_DIGITAL(c) (c->output_flag & (SDVO_TMDS_MASK | SDVO_LVDS_MASK))
> 
> 
> static const char *tv_format_names[] = {
>@@ -1363,6 +1364,18 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)
> 	return status;
> }
> 
>+static bool
>+intel_sdvo_connector_matches_edid(struct intel_sdvo_connector *sdvo,
>+				  struct edid *edid)
>+{
>+	bool monitor_is_digital = !!(edid->input & DRM_EDID_INPUT_DIGITAL);
>+	bool connector_is_digital = !!IS_DIGITAL(sdvo);
>+
>+	DRM_DEBUG_KMS("connector_is_digital? %d, monitor_is_digital? %d\n",
>+		      connector_is_digital, monitor_is_digital);
>+	return connector_is_digital == monitor_is_digital;
>+}
>+
> static enum drm_connector_status
> intel_sdvo_detect(struct drm_connector *connector, bool force)
> {
>@@ -1407,10 +1420,12 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
> 		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
>+			if (intel_sdvo_connector_matches_edid(intel_sdvo_connector,
>+							      edid))
> 				ret = connector_status_connected;
>+			else
>+				ret = connector_status_disconnected;
>+
> 			connector->display_info.raw_edid = NULL;
> 			kfree(edid);
> 		} else
>@@ -1451,11 +1466,8 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> 		edid = intel_sdvo_get_analog_edid(connector);
> 
> 	if (edid != NULL) {
>-		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) {
>+		if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
>+						      edid)) {
> 			drm_mode_connector_update_edid_property(connector, edid);
> 			drm_add_edid_modes(connector, edid);
> 		}
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 39216: 49068 | 49069 | 49112 | 49113 | 49114

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.