From 56e7f21c125a766011681614e54413a633861d7b Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 16 Oct 2013 11:49:01 -0400 Subject: [PATCH] Drop edid header fixup patch This was eventually solved in a better way upstream and we aren't applying it anyway. --- ...-try-harder-to-fix-up-broken-headers.patch | 47 ------------------- kernel.spec | 2 - 2 files changed, 49 deletions(-) delete mode 100644 drm-edid-try-harder-to-fix-up-broken-headers.patch diff --git a/drm-edid-try-harder-to-fix-up-broken-headers.patch b/drm-edid-try-harder-to-fix-up-broken-headers.patch deleted file mode 100644 index 26660d767..000000000 --- a/drm-edid-try-harder-to-fix-up-broken-headers.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 115cb7ab7d3b87fe43b1fe9b05ec894b1fcfb5cf Mon Sep 17 00:00:00 2001 -From: Adam Jackson -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 ---- - 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 - diff --git a/kernel.spec b/kernel.spec index c6d8fb269..0ccf9e938 100644 --- a/kernel.spec +++ b/kernel.spec @@ -665,7 +665,6 @@ Patch1003: sysrq-secure-boot.patch # virt + ksm patches # DRM -#atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch # nouveau + drm fixes # intel drm is all merged upstream @@ -1387,7 +1386,6 @@ ApplyPatch sysrq-secure-boot.patch # Assorted Virt Fixes # DRM core -#ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch # Nouveau DRM