Commit 2baf8377 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/edid: fix collision between two patches breaking build



this fixes a report that the new load code needed to be updated for
ajax's validity changes.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f7f6c340
......@@ -173,7 +173,7 @@ static int edid_load(struct drm_connector *connector, char *name,
}
memcpy(edid, fwdata, fwsize);
if (!drm_edid_block_valid(edid)) {
if (!drm_edid_block_valid(edid, 0)) {
DRM_ERROR("Base block of EDID firmware \"%s\" is invalid ",
name);
kfree(edid);
......@@ -185,7 +185,7 @@ static int edid_load(struct drm_connector *connector, char *name,
if (i != valid_extensions + 1)
memcpy(edid + (valid_extensions + 1) * EDID_LENGTH,
edid + i * EDID_LENGTH, EDID_LENGTH);
if (drm_edid_block_valid(edid + i * EDID_LENGTH))
if (drm_edid_block_valid(edid + i * EDID_LENGTH, i))
valid_extensions++;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment