summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-08-25 12:19:13 -0400
committerAdam Jackson <ajax@redhat.com>2017-08-25 12:19:13 -0400
commit723ea7b1b57860cc18bcc604d89c1893f202a470 (patch)
tree974a6a09449182a4a861f226fd6ca60e17daaad2
parent70c0b6903def00b3188d49b26085eadf66d3db0f (diff)
Remove "valid extension count" check
I don't think I've ever seen a block map in the wild, and at least data/dell-up2715k-dp has the value 2 here and seems otherwise cromulent, so let's stop calling this a problem.
-rw-r--r--edid-decode.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/edid-decode.c b/edid-decode.c
index b5f2006..ba710f0 100644
--- a/edid-decode.c
+++ b/edid-decode.c
@@ -57,7 +57,6 @@ static int has_valid_dummy_block = 1;
static int has_valid_week = 0;
static int has_valid_year = 0;
static int has_valid_detailed_blocks = 0;
-static int has_valid_extension_count = 0;
static int has_valid_descriptor_ordering = 1;
static int has_valid_descriptor_pad = 1;
static int has_valid_range_descriptor = 1;
@@ -2046,15 +2045,8 @@ int main(int argc, char **argv)
has_valid_detailed_blocks &= detailed_block(edid + 0x5A, 0);
has_valid_detailed_blocks &= detailed_block(edid + 0x6C, 0);
- /* check this, 1.4 verification guide says otherwise */
- if (edid[0x7e]) {
+ if (edid[0x7e])
printf("Has %d extension blocks\n", edid[0x7e]);
- /* 2 is impossible because of the block map */
- if (edid[0x7e] != 2)
- has_valid_extension_count = 1;
- } else {
- has_valid_extension_count = 1;
- }
has_valid_checksum = do_checksum(edid, EDID_PAGE_SIZE);
@@ -2117,7 +2109,6 @@ int main(int argc, char **argv)
!has_valid_week ||
!has_valid_detailed_blocks ||
!has_valid_dummy_block ||
- !has_valid_extension_count ||
!has_valid_descriptor_ordering ||
!has_valid_range_descriptor ||
!manufacturer_name_well_formed) {
@@ -2138,8 +2129,6 @@ int main(int argc, char **argv)
printf("\tDetailed blocks filled with garbage\n");
if (!has_valid_dummy_block)
printf("\tDummy block filled with garbage\n");
- if (!has_valid_extension_count)
- printf("\tImpossible extension block count\n");
if (!manufacturer_name_well_formed)
printf("\tManufacturer name field contains garbage\n");
if (!has_valid_descriptor_ordering)