rpms/kernel/F-12 drm-conservative-fallback-modes.patch, NONE, 1.1 kernel.spec, 1.1898, 1.1899

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18735

Modified Files:
	kernel.spec 
Added Files:
	drm-conservative-fallback-modes.patch 
Log Message:
* Tue Nov 03 2009 Adam Jackson <ajax at redhat.com> 2.6.31.5-113
- drm-conservative-fallback-modes.patch: When an output is connected but
  fails EDID, only add modes with refresh rates <= 60 (#514600)


drm-conservative-fallback-modes.patch:
 drm_edid.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE drm-conservative-fallback-modes.patch ---
diff -up linux-2.6.31.noarch/drivers/gpu/drm/drm_edid.c.jx linux-2.6.31.noarch/drivers/gpu/drm/drm_edid.c
--- linux-2.6.31.noarch/drivers/gpu/drm/drm_edid.c.jx	2009-11-03 14:49:07.000000000 -0500
+++ linux-2.6.31.noarch/drivers/gpu/drm/drm_edid.c	2009-11-03 16:55:49.000000000 -0500
@@ -1290,6 +1290,8 @@ int drm_add_modes_noedid(struct drm_conn
 					ptr->vdisplay > vdisplay)
 				continue;
 		}
+		if (drm_mode_vrefresh(ptr) > 61)
+			continue;
 		mode = drm_mode_duplicate(dev, ptr);
 		if (mode) {
 			drm_mode_probed_add(connector, mode);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -p -r1.1898 -r1.1899
--- kernel.spec	3 Nov 2009 05:00:37 -0000	1.1898
+++ kernel.spec	3 Nov 2009 22:02:28 -0000	1.1899
@@ -700,6 +700,7 @@ Patch1827: drm-disable-r600-aspm.patch
 Patch1828: drm-radeon-agp-font-fix.patch
 Patch1829: drm-radeon-fix-ring-rmw-issue.patch
 Patch1830: drm-r600-lenovo-w500-fix.patch
+Patch1831: drm-conservative-fallback-modes.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1390,6 +1391,7 @@ ApplyPatch drm-next-ea1495a6.patch
 ApplyPatch drm-radeon-agp-font-fix.patch
 ApplyPatch drm-radeon-fix-ring-rmw-issue.patch
 ApplyPatch drm-r600-lenovo-w500-fix.patch
+ApplyPatch drm-conservative-fallback-modes.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2112,6 +2114,10 @@ fi
 # and build.
 
 %changelog
+* Tue Nov 03 2009 Adam Jackson <ajax at redhat.com> 2.6.31.5-113
+- drm-conservative-fallback-modes.patch: When an output is connected but
+  fails EDID, only add modes with refresh rates <= 60 (#514600)
+
 * Tue Nov 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-112
 - drm-r600-lenovo-w500-fix.patch: add second patch from upstream fix