This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: edid-decode: fix DisplayID parse bug, fix spurious warning Author: Hans Verkuil <[email protected]> Date: Wed Jan 7 10:41:14 2026 +0100 The bpc value was misinterpreted when parsing the Display Parameters for DisplayID v2. Also fix a spurious warning when an unknown OUI is used. We only recognize a small list of OUIs, so unknown OUIs are perfectly fine. But do warn for an all-zero OUI. Signed-off-by: Hans Verkuil <[email protected]> utils/edid-decode/edid-decode.cpp | 4 ++-- utils/edid-decode/parse-displayid-block.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=ea9e12ad2131e2471d719fbfee17e89f0fca71f3 diff --git a/utils/edid-decode/edid-decode.cpp b/utils/edid-decode/edid-decode.cpp index e42ae0986663..530d6bc9e4a5 100644 --- a/utils/edid-decode/edid-decode.cpp +++ b/utils/edid-decode/edid-decode.cpp @@ -878,10 +878,10 @@ void edid_state::data_block_oui(std::string block_name, const unsigned char *x, warn("Expected PNP ID but found OUI.\n"); if (matched_reverse) fail("Endian-ness (%s) of OUI is different than expected (%s).\n", big_endian ? "be" : "le", big_endian ? "le" : "be"); + } else if (!do_ascii && !oui) { + warn("All zeroes OUI.\n"); } else if (!do_ascii && valid_ascii) { warn("Unknown OUI %s (possible PNP %s).\n", buf.c_str(), ascii); - } else if (!do_ascii) { - warn("Unknown OUI %s.\n", buf.c_str()); } } } diff --git a/utils/edid-decode/parse-displayid-block.cpp b/utils/edid-decode/parse-displayid-block.cpp index 2c630555217b..418cd2d52e88 100644 --- a/utils/edid-decode/parse-displayid-block.cpp +++ b/utils/edid-decode/parse-displayid-block.cpp @@ -1186,6 +1186,8 @@ static std::string ieee7542d(unsigned short fp) void edid_state::parse_displayid_parameters_v2(const unsigned char *x, unsigned block_rev) { + static const char *nat_col_depth[] = {"Not defined", "6", "8", "10", "12", "16", NULL, NULL}; + check_displayid_datablock_revision(x[1], 0, (x[1] & 7) == 1); if (!check_displayid_datablock_length(x, 29, 29)) return; @@ -1262,8 +1264,8 @@ void edid_state::parse_displayid_parameters_v2(const unsigned char *x, printf(" Native Color Depth: "); if (!(x[0x1e] & 0x07)) printf("Not defined\n"); - else if (bpc444[x[0x1e] & 0x07]) - printf("%s bpc\n", bpc444[x[0x1e] & 0x07]); + else if (nat_col_depth[x[0x1e] & 0x07]) + printf("%s bpc\n", nat_col_depth[x[0x1e] & 0x07]); else printf("Reserved\n"); printf(" Display Device Technology: "); _______________________________________________ linuxtv-commits mailing list -- [email protected] To unsubscribe send an email to [email protected]
