Attachment 39803 Details for Bug 31154 – 0001-DRM-ignore-invalid-EDID-extensions.patch

[patch] 0001-DRM-ignore-invalid-EDID-extensions.patch

0001-DRM-ignore-invalid-EDID-extensions.patch (text/plain), 2.39 KB, created by sam tygier on 2010-10-27 01:40:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sam tygier

Created: 2010-10-27 01:40:35 UTC

Size: 2.39 KB

patch

obsolete

>From 33d4041a583c417c00f71a5453fed6cff5278de5 Mon Sep 17 00:00:00 2001
>From: Sam Tygier <samtygier@yahoo.co.uk>
>Date: Thu, 23 Sep 2010 10:11:01 +0100
>Subject: [PATCH] DRM: ignore invalid EDID extensions
>
>Currently an invalid EDID extension will cause the whole EDID to be considered invalid. Instead just drop the invalid extensions, and return the valid ones. The base block is modified to claim to have the number valid extensions, and the check sum is updated.
>
>For my EIZO S2242W the base block is fine, but the extension block is all zeros. Without this patch I get no X and no VTs.
>
> Signed-off-by: Sam Tygier <samtygier@yahoo.co.uk>
>
>---
> drivers/gpu/drm/drm_edid.c |   26 ++++++++++++++++++++------
> 1 files changed, 20 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>index 96e9631..2e208fa 100644
>--- a/drivers/gpu/drm/drm_edid.c
>+++ b/drivers/gpu/drm/drm_edid.c
>@@ -241,7 +241,7 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf,
> 			.addr	= DDC_ADDR,
> 			.flags	= I2C_M_RD,
> 			.len	= len,
>-			.buf	= buf + start,
>+			.buf	= buf,
> 		}
> 	};
> 
>@@ -254,7 +254,7 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf,
> static u8 *
> drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
> {
>-	int i, j = 0;
>+	int i, j = 0, valid_extensions = 0;
> 	u8 *block, *new;
> 
> 	if ((block = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)
>@@ -281,14 +281,28 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
> 
> 	for (j = 1; j <= block[0x7e]; j++) {
> 		for (i = 0; i < 4; i++) {
>-			if (drm_do_probe_ddc_edid(adapter, block, j,
>-						  EDID_LENGTH))
>+			if (drm_do_probe_ddc_edid(adapter,
>+				  block + (valid_extensions + 1) * EDID_LENGTH,
>+				  j, EDID_LENGTH))
> 				goto out;
>-			if (drm_edid_block_valid(block + j * EDID_LENGTH))
>+			if (drm_edid_block_valid(block + (valid_extensions + 1) * EDID_LENGTH)) {
>+				valid_extensions++;
> 				break;
>+			}
> 		}
> 		if (i == 4)
>-			goto carp;
>+			dev_warn(connector->dev->dev,
>+			 "%s: Ignoring invalid EDID block %d.\n",
>+			 drm_get_connector_name(connector), j);
>+	}
>+
>+	if (valid_extensions != block[0x7e]) {
>+		block[EDID_LENGTH-1] += block[0x7e] - valid_extensions;
>+		block[0x7e] = valid_extensions;
>+		new = krealloc(block, (valid_extensions + 1) * EDID_LENGTH, GFP_KERNEL);
>+		if (!new)
>+			goto out;
>+		block = new;
> 	}
> 
> 	return block;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 31154: 39803

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.