edid: Change error messages and di-edid-decode printing

Following the changes in edid-decode.

Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>

di-edid-decode/edid.c

@@ -365,7 +365,7 @@ display_range_limits_type_name(enum di_edid_display_range_limits_type type)
 {
 	switch (type) {
 	case DI_EDID_DISPLAY_RANGE_LIMITS_BARE:
-		return "Bare Limits";
+		return "Range Limits Only";
 	case DI_EDID_DISPLAY_RANGE_LIMITS_DEFAULT_GTF:
 		return "GTF";
 	case DI_EDID_DISPLAY_RANGE_LIMITS_SECONDARY_GTF:
@@ -789,7 +789,8 @@ print_edid(const struct di_edid *edid)
 	printf("    Manufacturer: %.3s\n", vendor_product->manufacturer);
 	printf("    Model: %" PRIu16 "\n", vendor_product->product);
 	if (vendor_product->serial != 0) {
-		printf("    Serial Number: %" PRIu32 "\n", vendor_product->serial);
+		printf("    Serial Number: %" PRIu32 " (0x%08x)\n",
+		       vendor_product->serial, vendor_product->serial);
 	}
 	if (vendor_product->model_year != 0) {
 		printf("    Model year: %d\n", vendor_product->model_year);
@@ -915,7 +916,7 @@ print_edid(const struct di_edid *edid)
 		}
 	}
 	if (misc_features->continuous_freq) {
-		printf("    Display is continuous frequency\n");
+		printf("    Display supports continuous frequencies\n");
 	}
 	if (misc_features->default_gtf) {
 		printf("    Supports GTF timings within operating range\n");

edid.c

@@ -609,11 +609,13 @@ parse_display_range_limits(struct di_edid *edid,
 	if (edid->revision >= 4 && !edid->misc_features.continuous_freq) {
 		switch (base->type) {
 		case DI_EDID_DISPLAY_RANGE_LIMITS_DEFAULT_GTF:
+			add_failure(edid, "Display Range Limits: GTF is supported, but the display does not support continuous frequencies.");
+			return false;
 		case DI_EDID_DISPLAY_RANGE_LIMITS_SECONDARY_GTF:
-			add_failure(edid, "Display Range Limits: GTF can't be combined with non-continuous frequencies.");
+			add_failure(edid, "Display Range Limits: Secondary GTF is supported, but the display does not support continuous frequencies.");
 			return false;
 		case DI_EDID_DISPLAY_RANGE_LIMITS_CVT:
-			add_failure(edid, "Display Range Limits: CVT can't be combined with non-continuous frequencies.");
+			add_failure(edid, "Display Range Limits: CVT is supported, but the display does not support continuous frequencies.");
 			return false;
 		default:
 			break;

test/data/acer-p1276.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: ACR
-     Model: 5654
--    Serial Number: 4926 (0x0000133e)
-+    Serial Number: 4926
-     Made in: week 23 of 2013
-   Basic Display Parameters & Features:
-     Analog display
 @@ -65,23 +65,8 @@
      DTD 2:  1366x768    59.789541 Hz 683:384   47.712 kHz     85.500000 MHz
                   Hfront   70 Hsync 143 Hback  213 Hpol P

test/data/apple-xdr-dp.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: APP
-     Model: 44590
--    Serial Number: 621612546 (0x250d0e02)
-+    Serial Number: 621612546
-     Made in: week 1 of 2019
-   Basic Display Parameters & Features:
-     Digital display
 @@ -62,16 +62,13 @@
      DTD 6:  3840x2160   47.951737 Hz  16:9    134.696 kHz    528.010000 MHz (699 mm x 393 mm)
                   Hfront    8 Hsync  32 Hback   40 Hpol P

test/data/ayaneo-wxga.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: AYA
-     Model: 257
--    Serial Number: 539035143 (0x20210607)
-+    Serial Number: 539035143
-     Made in: week 49 of 2022
-   Basic Display Parameters & Features:
-     Digital display
 @@ -42,22 +42,6 @@
    Supports YCbCr 4:4:4
    Supports YCbCr 4:2:2

test/data/cvt.diff

@@ -1,20 +0,0 @@
---- ref
-+++ di
-@@ -13,7 +13,7 @@
-     Supported color formats: RGB 4:4:4, YCrCb 4:4:4
-     Default (sRGB) color space is primary color space
-     First detailed timing includes the native pixel format and preferred refresh rate
--    Display supports continuous frequencies
-+    Display is continuous frequency
-   Color Characteristics:
-     Red  : 0.6396, 0.3300
-     Green: 0.2998, 0.5996
-@@ -45,7 +45,7 @@
-                  Hfront  176 Hsync  88 Hback  296 Hpol P
-                  Vfront    8 Vsync  10 Vback   72 Vpol P
-     Display Range Limits:
--      Monitor ranges (Range Limits Only): 24-85 Hz V, 24-135 kHz H, max dotclock 600 MHz
-+      Monitor ranges (Bare Limits): 24-85 Hz V, 24-135 kHz H, max dotclock 600 MHz
-     Display Product Name: 'hdmi-1080p'
-     CVT 3 Byte Timing Codes:
-       CVT:  1920x1080   59.962844 Hz  16:9     67.158 kHz    173.000000 MHz

test/data/dell-2408wfp-dp.diff

@@ -1,20 +0,0 @@
---- ref
-+++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: DEL
-     Model: 41003
--    Serial Number: 842091859 (0x32314d53)
-+    Serial Number: 842091859
-     Made in: week 47 of 2008
-   Basic Display Parameters & Features:
-     Digital display
-@@ -39,7 +39,7 @@
-     Display Product Serial Number: 'G283H8BI21MS'
-     Display Product Name: 'DELL 2408WFP'
-     Display Range Limits:
--      Monitor ranges (Range Limits Only): 56-76 Hz V, 30-83 kHz H, max dotclock 170 MHz
-+      Monitor ranges (Bare Limits): 56-76 Hz V, 30-83 kHz H, max dotclock 170 MHz
- Checksum: 0x92
- 
- ----------------

test/data/goldstar-e2441.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: GSM
-     Model: 22560
--    Serial Number: 40809 (0x00009f69)
-+    Serial Number: 40809
-     Made in: week 5 of 2012
-   Basic Display Parameters & Features:
-     Digital display
 @@ -72,43 +72,21 @@
        Supported sample sizes (bits): 24 20 16
    Speaker Allocation Data Block:

test/data/goldstar-ite6604-hdmi.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: GSM
-     Model: 30310
--    Serial Number: 16843009 (0x01010101)
-+    Serial Number: 16843009
-     Made in: week 1 of 2012
-   Basic Display Parameters & Features:
-     Digital display
 @@ -24,7 +24,7 @@
      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

test/data/hitachi-55r6+.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: HEC
-     Model: 0
--    Serial Number: 472 (0x000001d8)
-+    Serial Number: 472
-     Made in: week 20 of 2020
-   Basic Display Parameters & Features:
-     Digital display
 @@ -102,26 +102,6 @@
    Colorimetry Data Block:
      BT2020YCC

test/data/hp-5dq99aa-hdmi.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: HPN
-     Model: 13847
--    Serial Number: 16843009 (0x01010101)
-+    Serial Number: 16843009
-     Made in: week 12 of 2019
-   Basic Display Parameters & Features:
-     Digital display
 @@ -60,23 +60,12 @@
      VIC  18:   720x576    50.000000 Hz  16:9     31.250 kHz     27.000000 MHz
      VIC  17:   720x576    50.000000 Hz   4:3     31.250 kHz     27.000000 MHz

test/data/msi-mag321curv-dp.diff

@@ -1,23 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: MSI
-     Model: 15778
--    Serial Number: 16843009 (0x01010101)
-+    Serial Number: 16843009
-     Made in: week 36 of 2019
-   Basic Display Parameters & Features:
-     Digital display
-@@ -15,7 +15,7 @@
-     Supported color formats: RGB 4:4:4, YCrCb 4:4:4, YCrCb 4:2:2
-     Default (sRGB) color space is primary color space
-     First detailed timing includes the native pixel format and preferred refresh rate
--    Display supports continuous frequencies
-+    Display is continuous frequency
-   Color Characteristics:
-     Red  : 0.6474, 0.3388
-     Green: 0.3144, 0.6171
 @@ -97,30 +97,12 @@
        Supported sample sizes (bits): 24 20 16
    Speaker Allocation Data Block:

test/data/panasonic-mei96a2-dp.diff

@@ -1,13 +1,6 @@
 --- ref
 +++ di
-@@ -27,15 +27,10 @@
+@@ -33,9 +33,4 @@
-                  Hfront   88 Hsync  32 Hback  120 Hpol P
-                  Vfront   28 Vsync   5 Vback  443 Vpol P
-     Display Range Limits:
--      Monitor ranges (Range Limits Only): 46-62 Hz V, 89-94 kHz H, max dotclock 260 MHz
-+      Monitor ranges (Bare Limits): 46-62 Hz V, 89-94 kHz H, max dotclock 260 MHz
-     Alphanumeric Data String: 'VVX14T058J10'
- Checksum: 0x09
  
  ----------------
  

test/data/philips-ftv-490.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: PHL
-     Model: 490
--    Serial Number: 16843009 (0x01010101)
-+    Serial Number: 16843009
-     Made in: week 46 of 2018
-   Basic Display Parameters & Features:
-     Digital display
 @@ -92,13 +92,10 @@
        Supported sample rates (kHz): 48 44.1 32
        Supports Joint Object Coding

test/data/qemu.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -43,7 +43,7 @@
-       DMT 0x41:  1856x1392   59.995184 Hz   4:3     86.333 kHz    218.250000 MHz
-       DMT 0x49:  1920x1440   60.000000 Hz   4:3     90.000 kHz    234.000000 MHz
-     Display Range Limits:
--      Monitor ranges (Range Limits Only): 50-125 Hz V, 30-160 kHz H, max dotclock 2550 MHz
-+      Monitor ranges (Bare Limits): 50-125 Hz V, 30-160 kHz H, max dotclock 2550 MHz
-     Display Product Name: 'QEMU Monitor'
-   Extension blocks: 1
- Checksum: 0x3a
 @@ -60,26 +60,12 @@
      VIC  89:  2560x1080   50.000000 Hz  64:27    56.250 kHz    185.625000 MHz
      VIC  31:  1920x1080   50.000000 Hz  16:9     56.250 kHz    148.500000 MHz

test/data/samsung-q800t-hdmi2.0.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: SAM
-     Model: 28734
--    Serial Number: 16780800 (0x01000e00)
-+    Serial Number: 16780800
-     Made in: week 1 of 2020
-   Basic Display Parameters & Features:
-     Digital display
 @@ -110,20 +110,6 @@
    Colorimetry Data Block:
      xvYCC601

test/data/samsung-s27a950d-dp.diff

@@ -28,10 +28,9 @@
  Failures:
  
  Block 0, Base EDID:
--  Display Range Limits: GTF is supported, but the display does not support continuous frequencies.
+   Display Range Limits: GTF is supported, but the display does not support 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.
 -
-+  Display Range Limits: GTF can't be combined with non-continuous frequencies.
  EDID conformity: FAIL

test/data/sun-gh19ps-dvi.diff

@@ -1,14 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: SUN
-     Model: 1420
--    Serial Number: 26628685 (0x0196524d)
-+    Serial Number: 26628685
-     Made in: week 32 of 2004
-   Basic Display Parameters & Features:
-     Digital display
 @@ -50,15 +50,4 @@
  
  ----------------

test/data/viewsonic-vp2768-dp.diff

@@ -1,23 +1,5 @@
 --- ref
 +++ di
-@@ -3,7 +3,7 @@
-   Vendor & Product Identification:
-     Manufacturer: VSC
-     Model: 8244
--    Serial Number: 16843009 (0x01010101)
-+    Serial Number: 16843009
-     Made in: week 15 of 2017
-   Basic Display Parameters & Features:
-     Digital display
-@@ -15,7 +15,7 @@
-     Supported color formats: RGB 4:4:4, YCrCb 4:4:4, YCrCb 4:2:2
-     Default (sRGB) color space is primary color space
-     First detailed timing includes the native pixel format and preferred refresh rate
--    Display supports continuous frequencies
-+    Display is continuous frequency
-   Color Characteristics:
-     Red  : 0.6611, 0.3300
-     Green: 0.2978, 0.6152
 @@ -104,10 +104,9 @@
      DTD 2:  1920x1080   60.000000 Hz  16:9     67.500 kHz    148.500000 MHz (597 mm x 336 mm)
                   Hfront   88 Hsync  44 Hback  148 Hpol P