summaryrefslogtreecommitdiffstats
path: root/drm-edid-try-harder-to-fix-up-broken-headers.patch
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-12-16 14:11:46 +1000
committerJosh Boyer <jwboyer@redhat.com>2011-12-16 11:19:59 -0500
commitb126e8d9a5baebde99b158ab667021129a6e8e67 (patch)
treed5374fa6e5b09edf1fac4dded2e0d7922689eec7 /drm-edid-try-harder-to-fix-up-broken-headers.patch
parentdd510300804dc2e8f2ab2b32471260df5d44d376 (diff)
downloadkernel-b126e8d9a5baebde99b158ab667021129a6e8e67.tar.gz
kernel-b126e8d9a5baebde99b158ab667021129a6e8e67.tar.xz
kernel-b126e8d9a5baebde99b158ab667021129a6e8e67.zip
drm: try harder to fix bad edids
Diffstat (limited to 'drm-edid-try-harder-to-fix-up-broken-headers.patch')
-rw-r--r--drm-edid-try-harder-to-fix-up-broken-headers.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/drm-edid-try-harder-to-fix-up-broken-headers.patch b/drm-edid-try-harder-to-fix-up-broken-headers.patch
new file mode 100644
index 000000000..26660d767
--- /dev/null
+++ b/drm-edid-try-harder-to-fix-up-broken-headers.patch
@@ -0,0 +1,47 @@
+From 115cb7ab7d3b87fe43b1fe9b05ec894b1fcfb5cf Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 7 Dec 2011 18:26:23 -0500
+Subject: [PATCH] drm/edid: Try harder to fix up broken headers
+
+There's no reason to force the first byte to be correct if we're already
+scoring how correct the header is.
+
+See also: https://bugzilla.redhat.com/show_bug.cgi?id=722909
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ drivers/gpu/drm/drm_edid.c | 18 ++++++++----------
+ 1 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
+index 7425e5c..8b16a49 100644
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -154,16 +154,14 @@ drm_edid_block_valid(u8 *raw_edid)
+ int i;
+ u8 csum = 0;
+ struct edid *edid = (struct edid *)raw_edid;
+-
+- if (raw_edid[0] == 0x00) {
+- int score = drm_edid_header_is_valid(raw_edid);
+- if (score == 8) ;
+- else if (score >= 6) {
+- DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
+- memcpy(raw_edid, edid_header, sizeof(edid_header));
+- } else {
+- goto bad;
+- }
++ int score = drm_edid_header_is_valid(raw_edid);
++
++ if (score == 8) ;
++ else if (score >= 6) {
++ DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
++ memcpy(raw_edid, edid_header, sizeof(edid_header));
++ } else {
++ goto bad;
+ }
+
+ for (i = 0; i < EDID_LENGTH; i++)
+--
+1.7.7.3
+