From ba46655ca9bf767c1f03ac1411ab115769b9ac82 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 5 Nov 2009 10:12:54 -0800 Subject: [PATCH] --- yaml --- r: 168867 b: refs/heads/master c: 7064fef56369c9e2c6e35ff6d6b4b63d42a859ce h: refs/heads/master i: 168865: 4fc44f274a286859112fbe6e414368965d526bad 168863: 86852339954ffeb287687826fcb58403a1152825 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_edid.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f9d626fea9ef..f51c0cb5a60f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ebf17174b4bdd99ab81c476714c91ee335fdcbf +refs/heads/master: 7064fef56369c9e2c6e35ff6d6b4b63d42a859ce diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c index cea665d86dd3..b54ba63d506e 100644 --- a/trunk/drivers/gpu/drm/drm_edid.c +++ b/trunk/drivers/gpu/drm/drm_edid.c @@ -662,6 +662,12 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, return NULL; } + /* Some EDIDs have bogus h/vtotal values */ + if (mode->hsync_end > mode->htotal) + mode->htotal = mode->hsync_end + 1; + if (mode->vsync_end > mode->vtotal) + mode->vtotal = mode->vsync_end + 1; + drm_mode_set_name(mode); if (pt->misc & DRM_EDID_PT_INTERLACED)