aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-02-17 18:12:09 -0500
committerDave Airlie <airlied@redhat.com>2010-03-14 20:58:17 -0400
commit44fef22416886a04d432043f741a6faf2c6ffefd (patch)
tree1518cb1ed887742151678d7d66266f45f984b882 /drivers/gpu
parent725398322d05486109375fbb85c3404108881e17 (diff)
drm/edid: allow certain bogus edids to hit a fixup path rather than fail
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_edid.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index f97e7c42ac8e..7e608f4a0df9 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -707,15 +707,6 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
707 mode->vsync_end = mode->vsync_start + vsync_pulse_width; 707 mode->vsync_end = mode->vsync_start + vsync_pulse_width;
708 mode->vtotal = mode->vdisplay + vblank; 708 mode->vtotal = mode->vdisplay + vblank;
709 709
710 /* perform the basic check for the detailed timing */
711 if (mode->hsync_end > mode->htotal ||
712 mode->vsync_end > mode->vtotal) {
713 drm_mode_destroy(dev, mode);
714 DRM_DEBUG_KMS("Incorrect detailed timing. "
715 "Sync is beyond the blank.\n");
716 return NULL;
717 }
718
719 /* Some EDIDs have bogus h/vtotal values */ 710 /* Some EDIDs have bogus h/vtotal values */
720 if (mode->hsync_end > mode->htotal) 711 if (mode->hsync_end > mode->htotal)
721 mode->htotal = mode->hsync_end + 1; 712 mode->htotal = mode->hsync_end + 1;