From 3b6404962288b2d35ec590fcfd68a7ec78a579e2 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 2 Aug 2022 11:21:29 +0200 Subject: [PATCH] di-edid-decode: print failure message Mirror upstream edid-decode. samsung-s27a950d-dp and hp-5dq99aa-hdmi are missing some failures about features we haven't implemented yet. panasonic-mei96a2-dp has a bogus "Missing Display Product Name" failure, see [1]. [1]: https://lore.kernel.org/linux-media/20220802093219.30599-1-contact@emersion.fr/T/#u Signed-off-by: Simon Ser --- di-edid-decode.c | 11 +++++++++++ test/data/dell-2408wfp-dp.diff | 8 +------- test/data/hp-5dq99aa-hdmi.diff | 11 ++++++----- test/data/panasonic-mei96a2-dp.diff | 11 ++++++----- test/data/samsung-s27a950d-dp.diff | 19 ++++++++++--------- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/di-edid-decode.c b/di-edid-decode.c index e1a977a..4a4a709 100644 --- a/di-edid-decode.c +++ b/di-edid-decode.c @@ -472,6 +472,7 @@ main(int argc, char *argv[]) const struct di_edid_detailed_timing_def *const *detailed_timing_defs; const struct di_edid_display_descriptor *const *display_descs; const struct di_edid_ext *const *exts; + const char *failure_msg; size_t i; in = stdin; @@ -666,6 +667,16 @@ main(int argc, char *argv[]) printf("Checksum: 0x%02hhx\n", raw[edid_checksum_index(i + 1)]); } + printf("\n----------------\n\n"); + + failure_msg = di_info_get_failure_msg(info); + if (failure_msg) { + printf("Failures:\n\n%s", failure_msg); + printf("EDID conformity: FAIL\n"); + } else { + printf("EDID conformity: PASS\n"); + } + di_info_destroy(info); return 0; } diff --git a/test/data/dell-2408wfp-dp.diff b/test/data/dell-2408wfp-dp.diff index 6fa2b7b..71157c9 100644 --- a/test/data/dell-2408wfp-dp.diff +++ b/test/data/dell-2408wfp-dp.diff @@ -1,6 +1,6 @@ --- ref +++ di -@@ -19,29 +19,16 @@ +@@ -19,23 +19,14 @@ Green: 0.1875, 0.7060 Blue : 0.1484, 0.0644 White: 0.3134, 0.3291 @@ -29,9 +29,3 @@ Display Product Serial Number: 'G283H8BI21MS' Display Product Name: 'DELL 2408WFP' Display Range Limits: - Monitor ranges (Bare Limits): 56-76 Hz V, 30-83 kHz H, max dotclock 170 MHz - Checksum: 0x92 -- ------------------ -- --EDID conformity: PASS diff --git a/test/data/hp-5dq99aa-hdmi.diff b/test/data/hp-5dq99aa-hdmi.diff index 159e0fe..1b34434 100644 --- a/test/data/hp-5dq99aa-hdmi.diff +++ b/test/data/hp-5dq99aa-hdmi.diff @@ -35,7 +35,7 @@ Display Range Limits: Monitor ranges (GTF): 46-75 Hz V, 30-112 kHz H, max dotclock 310 MHz Display Product Name: 'HP 27 QD' -@@ -51,73 +46,7 @@ +@@ -51,73 +46,11 @@ Supports YCbCr 4:2:2 Native detailed modes: 1 Video Data Block: @@ -93,9 +93,10 @@ - Hfront 48 Hsync 32 Hback 80 Hpol P - Vfront 3 Vsync 5 Vback 31 Vpol N -Checksum: 0xa3 Unused space in Extension Block: 10 bytes -- ------------------ -- ++Checksum: 0xa3 + + ---------------- + -Warnings: - -Block 1, CTA-861 Extension Block: @@ -109,4 +110,4 @@ - Video Capability Data Block: Set Selectable RGB Quantization to avoid interop issues. - -EDID conformity: FAIL -+Checksum: 0xa3 ++EDID conformity: PASS diff --git a/test/data/panasonic-mei96a2-dp.diff b/test/data/panasonic-mei96a2-dp.diff index 1de3ff1..781428f 100644 --- a/test/data/panasonic-mei96a2-dp.diff +++ b/test/data/panasonic-mei96a2-dp.diff @@ -1,6 +1,6 @@ --- ref +++ di -@@ -17,25 +17,15 @@ +@@ -17,15 +17,14 @@ Green: 0.2949, 0.6083 Blue : 0.1533, 0.0605 White: 0.3134, 0.3291 @@ -20,13 +20,14 @@ Display Range Limits: Monitor ranges (Bare Limits): 46-62 Hz V, 89-94 kHz H, max dotclock 260 MHz Alphanumeric Data String: 'VVX14T058J10' - Checksum: 0x09 -- ------------------ -- +@@ -33,9 +32,4 @@ + + ---------------- + -Failures: - -Block 0, Base EDID: - Missing Display Product Name. - -EDID conformity: FAIL ++EDID conformity: PASS diff --git a/test/data/samsung-s27a950d-dp.diff b/test/data/samsung-s27a950d-dp.diff index 956acec..1040907 100644 --- a/test/data/samsung-s27a950d-dp.diff +++ b/test/data/samsung-s27a950d-dp.diff @@ -22,7 +22,7 @@ Display Product Name: 'S27A950D' Extension blocks: 1 Checksum: 0x1b -@@ -41,29 +38,5 @@ +@@ -41,29 +38,13 @@ Basic audio support Native detailed modes: 0 Audio Data Block: @@ -33,9 +33,10 @@ Speaker Allocation Data Block: - FL/FR - Front Left/Right -Checksum: 0x71 Unused space in Extension Block: 115 bytes -- ------------------ -- ++Checksum: 0x71 + + ---------------- + -Warnings: - -Block 0, Base EDID: @@ -43,13 +44,13 @@ -Block 1, CTA-861 Extension Block: - Add a Colorimetry Data Block with the sRGB colorimetry bit set to avoid interop issues. - --Failures: -- --Block 0, Base EDID: + Failures: + + Block 0, Base EDID: - Display Range Limits: GTF can't be combined with non-continuous frequencies. -Block 1, CTA-861 Extension Block: - Required 640x480p60 timings are missing in the established timings and the SVD list (VIC 1). - Missing VCDB, needed for Set Selectable RGB Quantization to avoid interop issues. - --EDID conformity: FAIL -+Checksum: 0x71 ++ GTF can't be combined with non-continuous frequencies. + EDID conformity: FAIL