[PATCH] drm-edid

[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..0dc87f90532c 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1949,13 +1949,12 @@ 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)
+	if (i == 4) {
+		if (drm_edid_is_zero(edid, EDID_LENGTH))
+			connector->null_edid_counter++;
 		goto carp;
+	}
 
 	/* if there's no extensions, we're done */
 	valid_extensions = edid[0x7e];
-- 
2.20.1