Attachment 30613 Details for Bug 23842 – try the debug patch which deletes the strict EDID check

[patch] try the debug patch which deletes the strict EDID check

0001_revert_dvi_check.patch (text/plain), 4.21 KB, created by ykzhao on 2009-10-21 22:52:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ykzhao

Created: 2009-10-21 22:52:12 UTC

Size: 4.21 KB

patch

obsolete

>Subject: [Patch] drm/i915: Delete the strict EDID check for SDVO DVI-D monitor
>From: Zhao Yakui <yakui.zhao@intel.com>
>
>In theory we can use EDID obtained from the DVI-D monitor to detect whether 
>the device is connected or not. But on some boxes we can't get the EDID for
>the SDVO DVI-D although it is really connected. In such case it will be
>detected as disconnected, which causes that there is no connected output.
>
>So delete the strict check for the DVI-D monitor. When there is no EDID
>for the SDVO DVI-D monitor, we still detect them as connected.
>
>At the same time we will also add several default modes for it. For example:
>1680x1050@60, 1280x960@60Hz, 1024x768@60Hz, 800x600@60Hz. Otherwise it will
>have no display mode or very low resolution display mode(800x600).
>
>https://bugs.freedesktop.org/show_bug.cgi?id=24282
>https://bugs.freedesktop.org/show_bug.cgi?id=24458
>https://bugs.freedesktop.org/show_bug.cgi?id=23842
>
>Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
>cc: stable@kernel.org
>---
> drivers/gpu/drm/i915/intel_sdvo.c |   65 +++++++++++++++++++++++++++++++++++---
> 1 file changed, 61 insertions(+), 4 deletions(-)
>
>Index: linux-2.6/drivers/gpu/drm/i915/intel_sdvo.c
>===================================================================
>--- linux-2.6.orig/drivers/gpu/drm/i915/intel_sdvo.c	2009-10-22 11:46:46.000000000 +0800
>+++ linux-2.6/drivers/gpu/drm/i915/intel_sdvo.c	2009-10-22 11:49:24.000000000 +0800
>@@ -1602,8 +1602,10 @@
> 		kfree(edid);
> 		intel_output->base.display_info.raw_edid = NULL;
> 
>-	} else if (response & (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1))
>-		status = connector_status_disconnected;
>+	} else {
>+		status = connector_status_connected;
>+		DRM_DEBUG_KMS("No EDID is obtained. But still connected.\n");
>+	}
> 
> 	return status;
> }
>@@ -1634,7 +1636,55 @@
> 			return connector_status_unknown;
> 		sdvo_priv->attached_output = response;
> 	}
>-	return intel_sdvo_hdmi_sink_detect(connector, response);
>+	/*
>+	 * When the response doesn't belong to TMDS,it is unnecessary to check
>+	 * the EDID. In such case it will be detected as connected.
>+	 */
>+	if (response & (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1))
>+		return intel_sdvo_hdmi_sink_detect(connector, response);
>+	else
>+		return connector_status_connected;
>+}
>+
>+/* the default mode list for the DVI-D device when
>+ * there is no EDID
>+ */
>+static struct drm_display_mode sdvo_default_modes[] = {
>+	/* 640x480@60Hz */
>+	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656,
>+		   752, 800, 0, 480, 489, 492, 525, 0,
>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
>+	/* 800x600@60Hz */
>+	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840,
>+		   968, 1056, 0, 600, 601, 605, 628, 0,
>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
>+	/* 1024x768@60Hz */
>+	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048,
>+		   1184, 1344, 0, 768, 771, 777, 806, 0,
>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
>+	/* 1280x960@60Hz */
>+	{ DRM_MODE("1280x960", DRM_MODE_TYPE_DRIVER, 108000, 1280, 1376,
>+		   1488, 1800, 0, 960, 961, 964, 1000, 0,
>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
>+	/* 1680x1050@60Hz */
>+	{ DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 146250, 1680, 1784,
>+		   1960, 2240, 0, 1050, 1053, 1059, 1089, 0,
>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
>+};
>+
>+static void intel_sdvo_add_default_modes(struct drm_connector *connector)
>+{
>+	struct drm_device *dev = connector->dev;
>+	struct drm_display_mode *mode, *ptr;
>+	int i;
>+
>+	for (i = 0; i < sizeof(sdvo_default_modes) /
>+			sizeof(struct drm_display_mode); i++) {
>+		mode = &sdvo_default_modes[i];
>+		ptr = drm_mode_duplicate(dev, mode);
>+		if (ptr)
>+			drm_mode_probed_add(connector, ptr);
>+	}
> }
> 
> static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
>@@ -1662,10 +1712,17 @@
> 		digital_ddc_bus = intel_output->ddc_bus;
> 		intel_output->ddc_bus = sdvo_priv->analog_ddc_bus;
> 
>-		(void) intel_ddc_get_modes(intel_output);
>+		num_modes = intel_ddc_get_modes(intel_output);
> 
> 		intel_output->ddc_bus = digital_ddc_bus;
> 	}
>+	/*
>+	 * If we can't get the EDID for DVI-D monitor, we will add some default
>+	 * modes for it.
>+	 * For example: 1680x1050@60, 1280x960@60Hz, 1024x768@60, 800x600@60Hz.
>+	 */
>+	if (num_modes == 0)
>+		intel_sdvo_add_default_modes(connector);
> }
> 
> /*

Actions: View | Splinter Review

Attachments on bug 23842: 29416 | 29417 | 29418 | 29551 | 29567 | 30193 | 30344 | 30350 | 30371 | 30407 | 30465 | 30563 | 30613 | 30629 | 32084 | 32085 | 32093 | 32094 | 35321

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.