diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-04-30 08:26:16 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-30 08:26:16 +0200 |
| commit | 2baf8377997cce10bb730f306392f29794dea217 (patch) | |
| tree | af8c575227a5ef1f30af83f3da29dea35c93c290 | |
| parent | drm: fixed: Add dfixed_frac (diff) | |
| download | linux-2baf8377997cce10bb730f306392f29794dea217.tar.xz linux-2baf8377997cce10bb730f306392f29794dea217.zip | |
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: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_edid_load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index da9acba2dd6c..48c927c37041 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -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++; } |