diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-18 09:12:09 +1000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 07:47:45 -0700 |
commit | 6497174793773e9a72bc3ea6d49469c5846e9e9a (patch) | |
tree | 73a70ed8997742589be1cf141ddaa2022ce3f865 | |
parent | 19f00f070c17584b5acaf186baf4d12a7d2ed125 (diff) | |
download | kernel-crypto-6497174793773e9a72bc3ea6d49469c5846e9e9a.tar.gz kernel-crypto-6497174793773e9a72bc3ea6d49469c5846e9e9a.tar.xz kernel-crypto-6497174793773e9a72bc3ea6d49469c5846e9e9a.zip |
drm/edid: allow certain bogus edids to hit a fixup path rather than fail
commit 44fef22416886a04d432043f741a6faf2c6ffefd upstream.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index ab6c9733041..99d7eb366d3 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, mode->vsync_end = mode->vsync_start + vsync_pulse_width; mode->vtotal = mode->vdisplay + vblank; - /* perform the basic check for the detailed timing */ - if (mode->hsync_end > mode->htotal || - mode->vsync_end > mode->vtotal) { - drm_mode_destroy(dev, mode); - DRM_DEBUG_KMS("Incorrect detailed timing. " - "Sync is beyond the blank.\n"); - return NULL; - } - /* Some EDIDs have bogus h/vtotal values */ if (mode->hsync_end > mode->htotal) mode->htotal = mode->hsync_end + 1; |