diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-04-02 17:56:24 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-02 19:21:46 -0400 |
| commit | b94ee6528954b6838e88aa8cf74ed75acf8dfcff (patch) | |
| tree | ad2c401b8878a367e3eb81d98cf1d42b86d81496 | |
| parent | 6714977b45279c3a0b0ec2bc937284d9f116752f (diff) | |
drm: fix EDID backward compat check
EDIDs should be backward compatible, so don't bail if we see a version
of 3 (which is out there now) and print a message if we see something
newer, but allow it to be parsed.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 2c4a340e682f..ca9c61656714 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
| @@ -125,10 +125,8 @@ static bool edid_is_valid(struct edid *edid) | |||
| 125 | DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version); | 125 | DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version); |
| 126 | goto bad; | 126 | goto bad; |
| 127 | } | 127 | } |
| 128 | if (edid->revision > 3) { | 128 | if (edid->revision > 4) |
| 129 | DRM_ERROR("EDID has minor version %d, which is not between 0-3\n", edid->revision); | 129 | DRM_DEBUG("EDID minor > 4, assuming backward compatibility\n"); |
| 130 | goto bad; | ||
| 131 | } | ||
| 132 | 130 | ||
| 133 | for (i = 0; i < EDID_LENGTH; i++) | 131 | for (i = 0; i < EDID_LENGTH; i++) |
| 134 | csum += raw_edid[i]; | 132 | csum += raw_edid[i]; |
