rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm: try harder to fix bad edids

This commit is contained in:
Ben Skeggs 2011-12-16 14:11:46 +10:00 committed by Josh Boyer
parent dd51030080
commit b126e8d9a5
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -6,6 +6,9 @@
* efi-dont-map-boot-services-on-32bit.patch
* epoll-limit-paths.patch (in linux-next via -mm tree)
**** Queued for 3.3 ***********************************************************************************
drm-edid-try-harder-to-fix-up-broken-headers.patch
**** Other stuff that should go upstream (in decreasing likelyhood) ************************************
* linux-2.6-acpi-video-dos.patch

47
drm-edid-try-harder-to-fix-up-broken-headers.patch Normal file
View File

@ -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

7
kernel.spec
View File

@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 1
%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -676,6 +676,7 @@ Patch800: linux-2.6-crash-driver.patch
Patch1555: fix_xen_guest_on_old_EC2.patch
# DRM
Patch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
# nouveau + drm fixes
# intel drm is all merged upstream
@ -1361,6 +1362,7 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch
ApplyPatch fix_xen_guest_on_old_EC2.patch
# DRM core
ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
# Nouveau DRM
@ -2231,6 +2233,9 @@ fi
# ||----w |
# || ||
%changelog
* Fri Dec 16 2011 Ben Skeggs <bskeggs@redhat.com>
- Add patch to do a better job of dealing with busted EDID headers (rhbz#751589)
* Thu Dec 15 2011 Josh Boyer <jwboyer@redhat.com> - 3.2.0-0.rc5.git3.1
- Linux 3.2-rc5-git3 (55b02d2f4445ad625213817a1736bf2884d32547)