rpms/kernel/F-11 drm-edid-ignore-tiny-modes.patch, NONE, 1.1 kernel.spec, 1.1604, 1.1605

[Adam Jackson]

Author: ajax

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

Modified Files:
	kernel.spec 
Added Files:
	drm-edid-ignore-tiny-modes.patch 
Log Message:
* Fri May 15 2009 Adam Jackson <ajax at redhat.com>
- drm: ignore tiny modes from EDID.


drm-edid-ignore-tiny-modes.patch:

--- NEW FILE drm-edid-ignore-tiny-modes.patch ---
diff -up linux-2.6.29.noarch/drivers/gpu/drm/drm_edid.c.jx linux-2.6.29.noarch/drivers/gpu/drm/drm_edid.c
--- linux-2.6.29.noarch/drivers/gpu/drm/drm_edid.c.jx	2009-05-15 15:16:07.000000000 -0400
+++ linux-2.6.29.noarch/drivers/gpu/drm/drm_edid.c	2009-05-15 16:05:16.000000000 -0400
@@ -289,6 +289,11 @@ static struct drm_display_mode *drm_mode
 	struct drm_display_mode *mode;
 	struct detailed_pixel_timing *pt = &timing->data.pixel_data;
 
+	/* ignore tiny modes */
+	if (((pt->hactive_hi << 8) | pt->hactive_lo) < 64 ||
+	    ((pt->vactive_hi << 8) | pt->hactive_lo) < 64)
+		return NULL;
+
 	if (pt->stereo) {
 		printk(KERN_WARNING "stereo mode not supported\n");
 		return NULL;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1604
retrieving revision 1.1605
diff -u -p -r1.1604 -r1.1605
--- kernel.spec	13 May 2009 02:22:55 -0000	1.1604
+++ kernel.spec	15 May 2009 20:10:54 -0000	1.1605
@@ -698,6 +698,7 @@ Patch1824: drm-intel-hdmi-edid-fix.patch
 Patch1825: drm-intel-tiling-transition.patch
 Patch1826: drm-intel-next.patch
 Patch1828: drm-intel-debugfs-ringbuffer.patch
+Patch1829: drm-edid-ignore-tiny-modes.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1349,6 +1350,7 @@ ApplyPatch drm-intel-hdmi-edid-fix.patch
 ApplyPatch drm-intel-tiling-transition.patch
 ApplyPatch drm-intel-next.patch
 ApplyPatch drm-intel-debugfs-ringbuffer.patch
+ApplyPatch drm-edid-ignore-tiny-modes.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1970,6 +1972,9 @@ fi
 # and build.
 
 %changelog
+* Fri May 15 2009 Adam Jackson <ajax at redhat.com>
+- drm: ignore tiny modes from EDID.
+
 * Tue May 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-142
 - linux-2.6-iommu-fixes.patch: intel-iommu: fix PCI device detach
     from virtual machine