From 9003e14feee32d640f3fd8605e9d05712a722bfd Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 4 Jun 2009 10:20:34 +1000
Subject: [PATCH] --- yaml --- r: 145488 b: refs/heads/master c:
 fc43896630a421321a19d7970bac27ac94e9d162 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_edid.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f6b61fdd476d..2365dd59a2e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c51d1cfa0a370b48a157163340190cf5fd2346b
+refs/heads/master: fc43896630a421321a19d7970bac27ac94e9d162
diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c
index ca9c61656714..6f6b26479d82 100644
--- a/trunk/drivers/gpu/drm/drm_edid.c
+++ b/trunk/drivers/gpu/drm/drm_edid.c
@@ -289,6 +289,11 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 	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;