From 6de5a8c08b180a4a4e85fd56afb5d7fedb94eac3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 30 Apr 2012 07:26:16 +0100 Subject: [PATCH] --- yaml --- r: 307111 b: refs/heads/master c: 2baf8377997cce10bb730f306392f29794dea217 h: refs/heads/master i: 307109: 37370e7f3623f396a846d40ff8f51de65b61d800 307107: fcbef3186179e8befbaf881b568dbb96b3349b8e 307103: 8a9e7e1715b42ba77cb2a08be142c967a71ef93b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_edid_load.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e8aab68d8b71..b8d11edb1cf0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7f6c340f9d8f11bee50aef647b8578348957936 +refs/heads/master: 2baf8377997cce10bb730f306392f29794dea217 diff --git a/trunk/drivers/gpu/drm/drm_edid_load.c b/trunk/drivers/gpu/drm/drm_edid_load.c index da9acba2dd6c..48c927c37041 100644 --- a/trunk/drivers/gpu/drm/drm_edid_load.c +++ b/trunk/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++; }