[PATCH] drm-edid2

[Chris Wilson]

---
 drivers/gpu/drm/drm_edid.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 631125b46e04..79c0b628ad3f 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1949,10 +1949,6 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
 		if (drm_edid_block_valid(edid, 0, false,
 					 &connector->edid_corrupt))
 			break;
-		if (i == 0 && drm_edid_is_zero(edid, EDID_LENGTH)) {
-			connector->null_edid_counter++;
-			goto carp;
-		}
 	}
 	if (i == 4)
 		goto carp;
@@ -2012,7 +2008,10 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
 	return (struct edid *)edid;
 
 carp:
-	connector_bad_edid(connector, edid, 1);
+	if (!drm_edid_is_zero(edid, EDID_LENGTH))
+		connector_bad_edid(connector, edid, 1);
+	else
+		connector->null_edid_counter++;
 out:
 	kfree(edid);
 	return NULL;
-- 
2.20.1