edid: do not fail when extension block has invalid checksum

Unfortunately having an invalid checksum is a common issue in several
EDID extensions. Instead of failing to parsing when a bad checksum is
found, simply report the error.

This also fixes an error in which the checksum failure was being printed
in the base block.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro committed 2025-07-03 23:05:57 -03:00
1 parent e14d7b59cd
commit d0c43cb795
4 files changed
+78 -82

No files matched your search

+36 -25
View File
@@ -1122,35 +1122,52 @@ parse_byte_descriptor(struct di_edid *edid,
return true;
}
static const char *
ext_tag_name(enum di_edid_ext_tag tag)
{
switch (tag) {
case DI_EDID_EXT_CEA:
return "CTA-861 Extension Block";
case DI_EDID_EXT_VTB:
return "Video Timing Extension Block";
case DI_EDID_EXT_DI:
return "Display Information Extension Block";
case DI_EDID_EXT_LS:
return "Localized String Extension Block";
case DI_EDID_EXT_DPVL:
return "Digital Packet Video Link Extension";
case DI_EDID_EXT_BLOCK_MAP:
return "Block Map Extension Block";
case DI_EDID_EXT_VENDOR:
return "Manufacturer-Specific Extension Block";
case DI_EDID_EXT_DISPLAYID:
return "DisplayID Extension Block";
}
return "Unknown Extension Block";
}
static bool
parse_ext(struct di_edid *edid, const uint8_t data[static EDID_BLOCK_SIZE])
{
struct di_edid_ext *ext;
uint8_t tag;
struct di_logger logger;
char section_name[64];
if (!validate_block_checksum(data)) {
add_failure(edid, "Invalid extension checksum.");
return true;
}
ext = calloc(1, sizeof(*ext));
if (!ext) {
return false;
}
ext->tag = data[0x00];
tag = data[0x00];
switch (tag) {
snprintf(section_name, sizeof(section_name), "Block %zu, %s",
edid->exts_len + 1, ext_tag_name(ext->tag));
logger = (struct di_logger) {
.f = edid->logger->f,
.section = section_name,
};
switch (ext->tag) {
case DI_EDID_EXT_CEA:
snprintf(section_name, sizeof(section_name),
"Block %zu, CTA-861 Extension Block",
edid->exts_len + 1);
logger = (struct di_logger) {
.f = edid->logger->f,
.section = section_name,
};
if (!_di_edid_cta_parse(&ext->cta, data, EDID_BLOCK_SIZE, &logger)) {
free(ext);
return errno == EINVAL;
@@ -1165,14 +1182,6 @@ parse_ext(struct di_edid *edid, const uint8_t data[static EDID_BLOCK_SIZE])
/* Supported */
break;
case DI_EDID_EXT_DISPLAYID:
snprintf(section_name, sizeof(section_name),
"Block %zu, DisplayID Extension Block",
edid->exts_len + 1);
logger = (struct di_logger) {
.f = edid->logger->f,
.section = section_name,
};
if (!_di_displayid_parse(&ext->displayid, &data[1],
EDID_BLOCK_SIZE - 2, &logger)) {
free(ext);
@@ -1186,7 +1195,9 @@ parse_ext(struct di_edid *edid, const uint8_t data[static EDID_BLOCK_SIZE])
return true;
}
ext->tag = tag;
if (!validate_block_checksum(data))
_di_logger_add_failure(&logger, "Invalid extension checksum.");
assert(edid->exts_len < EDID_MAX_BLOCK_COUNT - 1);
edid->exts[edid->exts_len++] = ext;
return true;
+3
View File
@@ -18,4 +18,7 @@ struct di_logger {
void
_di_logger_va_add_failure(struct di_logger *logger, const char fmt[], va_list args);
void
_di_logger_add_failure(struct di_logger *logger, const char fmt[], ...);
#endif
+16
View File
@@ -15,3 +15,19 @@ _di_logger_va_add_failure(struct di_logger *logger, const char fmt[], va_list ar
vfprintf(logger->f, fmt, args);
fprintf(logger->f, "\n");
}
/**
* Sometimes calling the functions that wrap _di_logger_va_add_failure() (e.g.
* add_failure() in edid.c) is not possible, because we want to use a specific
* logger (and not e.g. edid->logger). This allow us to log with a custom
* logger. Avoid using this if not necessary.
*/
void
_di_logger_add_failure(struct di_logger *logger, const char fmt[], ...)
{
va_list args;
va_start(args, fmt);
_di_logger_va_add_failure(logger, fmt, args);
va_end(args);
}
+23 -57
View File
@@ -9,44 +9,10 @@
DMT 0x09: 800x600 60.316541 Hz 4:3 37.879 kHz 40.000000 MHz
DMT 0x10: 1024x768 60.003840 Hz 4:3 48.363 kHz 65.000000 MHz
DMT 0x23: 1280x1024 60.019740 Hz 5:4 63.981 kHz 108.000000 MHz
@@ -43,97 +43,12 @@
Display Range Limits:
Monitor ranges (GTF): 57-75 Hz V, 31-84 kHz H, max dotclock 180 MHz
Display Product Name: '37LG5000'
- Extension blocks: 1
Checksum: 0x72
----------------
-Block 1, CTA-861 Extension Block:
- Revision: 3
- Underscans IT Video Formats by default
- Basic audio support
- Supports YCbCr 4:4:4
- Supports YCbCr 4:2:2
- Native detailed modes: 1
- Video Data Block:
- VIC 1: 640x480 59.940476 Hz 4:3 31.469 kHz 25.175000 MHz (native)
- VIC 2: 720x480 59.940060 Hz 4:3 31.469 kHz 27.000000 MHz
- VIC 3: 720x480 59.940060 Hz 16:9 31.469 kHz 27.000000 MHz
- VIC 21: 1440x576i 50.000000 Hz 4:3 15.625 kHz 27.000000 MHz
- VIC 18: 720x576 50.000000 Hz 16:9 31.250 kHz 27.000000 MHz
- VIC 19: 1280x720 50.000000 Hz 16:9 37.500 kHz 74.250000 MHz
- VIC 4: 1280x720 60.000000 Hz 16:9 45.000 kHz 74.250000 MHz
- VIC 20: 1920x1080i 50.000000 Hz 16:9 28.125 kHz 74.250000 MHz
- VIC 5: 1920x1080i 60.000000 Hz 16:9 33.750 kHz 74.250000 MHz
- VIC 32: 1920x1080 24.000000 Hz 16:9 27.000 kHz 74.250000 MHz
- VIC 33: 1920x1080 25.000000 Hz 16:9 28.125 kHz 74.250000 MHz
- VIC 34: 1920x1080 30.000000 Hz 16:9 33.750 kHz 74.250000 MHz
- VIC 31: 1920x1080 50.000000 Hz 16:9 56.250 kHz 148.500000 MHz
- VIC 16: 1920x1080 60.000000 Hz 16:9 67.500 kHz 148.500000 MHz
- Audio Data Block:
- Linear PCM:
- Max channels: 2
- Supported sample rates (kHz): 48 44.1 32
- Supported sample sizes (bits): 24 20 16
- Speaker Allocation Data Block:
- FL/FR - Front Left/Right
@@ -77,13 +77,6 @@
Supported sample sizes (bits): 24 20 16
Speaker Allocation Data Block:
FL/FR - Front Left/Right
- Vendor-Specific Data Block (HDMI), OUI 00-0C-03:
- Source physical address: 1.0.0.0
- Supports_AI
@@ -54,28 +20,28 @@
- DC_30bit
- DC_Y444
- Maximum TMDS clock: 225 MHz
- Detailed Timing Descriptors:
- DTD 3: 1280x720 59.654270 Hz 16:9 44.621 kHz 74.250000 MHz (700 mm x 392 mm)
- Hfront 64 Hsync 128 Hback 192 Hpol P
- Vfront 3 Vsync 5 Vback 20 Vpol P
- DTD 4: 720x480 59.940060 Hz 3:2 31.469 kHz 27.000000 MHz (531 mm x 398 mm)
- Hfront 16 Hsync 62 Hback 60 Hpol N
- Vfront 9 Vsync 6 Vback 30 Vpol N
- DTD 5: 1920x1080 60.000000 Hz 16:9 67.500 kHz 148.500000 MHz (518 mm x 324 mm)
- Hfront 88 Hsync 44 Hback 148 Hpol P
- Vfront 4 Vsync 5 Vback 36 Vpol P
Detailed Timing Descriptors:
DTD 3: 1280x720 59.654270 Hz 16:9 44.621 kHz 74.250000 MHz (700 mm x 392 mm)
Hfront 64 Hsync 128 Hback 192 Hpol P
@@ -94,46 +87,18 @@
DTD 5: 1920x1080 60.000000 Hz 16:9 67.500 kHz 148.500000 MHz (518 mm x 324 mm)
Hfront 88 Hsync 44 Hback 148 Hpol P
Vfront 4 Vsync 5 Vback 36 Vpol P
- DTD 6: 1920x1080i 60.000000 Hz 16:9 33.750 kHz 74.250000 MHz (708 mm x 398 mm)
- Hfront 88 Hsync 44 Hback 148 Hpol P
+ DTD 6: 1920x540 i 60.053381 Hz 32:9 33.750 kHz 74.250000 MHz (708 mm x 398 mm)
Hfront 88 Hsync 44 Hback 148 Hpol P
- Vfront 2 Vsync 5 Vback 15 Vpol P Vfront +0.5 Odd Field
- Vfront 2 Vsync 5 Vback 15 Vpol P Vback +0.5 Even Field
- DTD 7: 1280x928 51.897691 Hz 40:29 48.161 kHz 80.140000 MHz (700 mm x 392 mm)
- Hfront 64 Hsync 128 Hback 192 Hpol N
- Vfront 3 Vsync 7 Vback -10 Vpol N
+ Vfront 2 Vsync 5 Vback 15 Vpol P
DTD 7: 1280x928 51.897691 Hz 40:29 48.161 kHz 80.140000 MHz (700 mm x 392 mm)
Hfront 64 Hsync 128 Hback 192 Hpol N
Vfront 3 Vsync 7 Vback -10 Vpol N
- 4e 1f 00 80 51 a0 00 30 40 80 37 00 bc 88 21 00 00 18 'N...Q..0@.7...!...'
-Checksum: 0x34 (should be 0xb2) Unused space in Extension Block: 2 bytes
-
-----------------
-
+Checksum: 0x34
----------------
-Warnings:
-
-Block 0, Base EDID:
@@ -90,9 +56,9 @@
-
Failures:
Block 0, Base EDID:
-Block 0, Base EDID:
- Detailed Timing Descriptor #1: Mismatch of image size 1000x550 mm vs display size 700x390 mm.
-Block 1, CTA-861 Extension Block:
Block 1, CTA-861 Extension Block:
- Detailed Timing Descriptor #5: Mismatch of image size 518x324 mm vs display size 700x390 mm.
- Detailed Timing Descriptor #7: 0 values in the video timing:
- Horizontal Active/Blanking 1280/384