v4l2-ctl: update test EDIDs

- The hdmi-4k-600mhz version didn't set SCDC support
- Add support for the new Video Format Preference Data Block

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

1 files changed, 37 insertions, 37 deletions

diff --git a/utils/v4l2-ctl/v4l2-ctl-edid.cpp b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
index e803e41f..c3a4a28a 100644
--- a/utils/v4l2-ctl/v4l2-ctl-edid.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
@@ -789,22 +789,22 @@ static uint8_t hdmi_edid[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc4,
 
-	0x02, 0x03, 0x2d, 0xf1, 0x4c, 0x10, 0x1f, 0x04,
+	0x02, 0x03, 0x30, 0xf1, 0x4c, 0x10, 0x1f, 0x04,
 	0x13, 0x22, 0x21, 0x20, 0x05, 0x14, 0x02, 0x11,
 	0x01, 0x23, 0x09, 0x07, 0x07, 0x83, 0x01, 0x00,
 	0x00, 0x68, 0x03, 0x0c, 0x00, 0x10, 0x00, 0x00,
 	0x22, 0x01, 0xe2, 0x00, 0xca, 0xe3, 0x05, 0x00,
-	0x00, 0xe3, 0x06, 0x01, 0x00, 0x1a, 0x36, 0x80,
-	0xa0, 0x70, 0x38, 0x1f, 0x40, 0x30, 0x20, 0x35,
-	0x00, 0xe0, 0x0e, 0x11, 0x00, 0x00, 0x1a, 0x1a,
-	0x1d, 0x00, 0x80, 0x51, 0xd0, 0x1c, 0x20, 0x40,
-	0x80, 0x35, 0x00, 0xe0, 0x0e, 0x11, 0x00, 0x00,
-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xe3, 0x06, 0x01, 0x00, 0xe2, 0x0d, 0x10,
+	0x1a, 0x36, 0x80, 0xa0, 0x70, 0x38, 0x1f, 0x40,
+	0x30, 0x20, 0x35, 0x00, 0xe0, 0x0e, 0x11, 0x00,
+	0x00, 0x1a, 0x1a, 0x1d, 0x00, 0x80, 0x51, 0xd0,
+	0x1c, 0x20, 0x40, 0x80, 0x35, 0x00, 0xe0, 0x0e,
+	0x11, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9a,
 };
 
 static uint8_t hdmi_edid_4k_170[256] = {
@@ -825,22 +825,22 @@ static uint8_t hdmi_edid_4k_170[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb9,
 
-	0x02, 0x03, 0x32, 0xf1, 0x4c, 0x10, 0x1f, 0x04,
+	0x02, 0x03, 0x36, 0xf1, 0x4c, 0x10, 0x1f, 0x04,
 	0x13, 0x22, 0x21, 0x20, 0x05, 0x14, 0x02, 0x11,
 	0x01, 0x23, 0x09, 0x07, 0x07, 0x83, 0x01, 0x00,
 	0x00, 0x68, 0x03, 0x0c, 0x00, 0x10, 0x00, 0x00,
 	0x22, 0x01, 0xe2, 0x00, 0xca, 0xe4, 0x0e, 0x5f,
 	0x5e, 0x5d, 0xe3, 0x05, 0x00, 0x00, 0xe3, 0x06,
-	0x01, 0x00, 0x1a, 0x36, 0x80, 0xa0, 0x70, 0x38,
-	0x1f, 0x40, 0x30, 0x20, 0x35, 0x00, 0xc0, 0x1c,
-	0x32, 0x00, 0x00, 0x1a, 0x1a, 0x1d, 0x00, 0x80,
-	0x51, 0xd0, 0x1c, 0x20, 0x40, 0x80, 0x35, 0x00,
-	0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1c, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x00, 0xe3, 0x0d, 0x10, 0x5f, 0x1a, 0x36,
+	0x80, 0xa0, 0x70, 0x38, 0x1f, 0x40, 0x30, 0x20,
+	0x35, 0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1a,
+	0x1a, 0x1d, 0x00, 0x80, 0x51, 0xd0, 0x1c, 0x20,
+	0x40, 0x80, 0x35, 0x00, 0xc0, 0x1c, 0x32, 0x00,
+	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
 };
 
 static uint8_t hdmi_edid_4k_300[256] = {
@@ -861,22 +861,22 @@ static uint8_t hdmi_edid_4k_300[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc5,
 
-	0x02, 0x03, 0x3d, 0xf1, 0x4f, 0x5f, 0x5e, 0x5d,
+	0x02, 0x03, 0x40, 0xf1, 0x4f, 0x5f, 0x5e, 0x5d,
 	0x10, 0x1f, 0x04, 0x13, 0x22, 0x21, 0x20, 0x05,
 	0x14, 0x02, 0x11, 0x01, 0x23, 0x09, 0x07, 0x07,
 	0x83, 0x01, 0x00, 0x00, 0x6d, 0x03, 0x0c, 0x00,
 	0x10, 0x00, 0x00, 0x3c, 0x21, 0x00, 0x60, 0x01,
 	0x02, 0x03, 0x67, 0xd8, 0x5d, 0xc4, 0x01, 0x00,
 	0x00, 0x00, 0xe2, 0x00, 0xca, 0xe3, 0x05, 0x00,
-	0x00, 0xe3, 0x06, 0x01, 0x00, 0xa3, 0x66, 0x00,
-	0xa0, 0xf0, 0x70, 0x1f, 0x80, 0x30, 0x20, 0x35,
-	0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1e, 0x1a,
-	0x36, 0x80, 0xa0, 0x70, 0x38, 0x1f, 0x40, 0x30,
-	0x20, 0x35, 0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00,
-	0x1a, 0x1a, 0x1d, 0x00, 0x80, 0x51, 0xd0, 0x1c,
-	0x20, 0x40, 0x80, 0x35, 0x00, 0xc0, 0x1c, 0x32,
-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2,
+	0x00, 0xe3, 0x06, 0x01, 0x00, 0xe2, 0x0d, 0x5f,
+	0xa3, 0x66, 0x00, 0xa0, 0xf0, 0x70, 0x1f, 0x80,
+	0x30, 0x20, 0x35, 0x00, 0xc0, 0x1c, 0x32, 0x00,
+	0x00, 0x1e, 0x1a, 0x36, 0x80, 0xa0, 0x70, 0x38,
+	0x1f, 0x40, 0x30, 0x20, 0x35, 0x00, 0xc0, 0x1c,
+	0x32, 0x00, 0x00, 0x1a, 0x1a, 0x1d, 0x00, 0x80,
+	0x51, 0xd0, 0x1c, 0x20, 0x40, 0x80, 0x35, 0x00,
+	0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1c, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1,
 };
 
 static uint8_t hdmi_edid_4k_600[256] = {
@@ -897,22 +897,22 @@ static uint8_t hdmi_edid_4k_600[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2c,
 
-	0x02, 0x03, 0x3f, 0xf1, 0x51, 0x61, 0x60, 0x5f,
+	0x02, 0x03, 0x42, 0xf1, 0x51, 0x61, 0x60, 0x5f,
 	0x5e, 0x5d, 0x10, 0x1f, 0x04, 0x13, 0x22, 0x21,
 	0x20, 0x05, 0x14, 0x02, 0x11, 0x01, 0x23, 0x09,
 	0x07, 0x07, 0x83, 0x01, 0x00, 0x00, 0x6d, 0x03,
 	0x0c, 0x00, 0x10, 0x00, 0x00, 0x3c, 0x21, 0x00,
 	0x60, 0x01, 0x02, 0x03, 0x67, 0xd8, 0x5d, 0xc4,
-	0x01, 0x78, 0x00, 0x00, 0xe2, 0x00, 0xca, 0xe3,
-	0x05, 0x00, 0x00, 0xe3, 0x06, 0x01, 0x00, 0x4d,
-	0xd0, 0x00, 0xa0, 0xf0, 0x70, 0x3e, 0x80, 0x30,
-	0x20, 0x35, 0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00,
-	0x1e, 0x1a, 0x36, 0x80, 0xa0, 0x70, 0x38, 0x1f,
-	0x40, 0x30, 0x20, 0x35, 0x00, 0xc0, 0x1c, 0x32,
-	0x00, 0x00, 0x1a, 0x1a, 0x1d, 0x00, 0x80, 0x51,
-	0xd0, 0x1c, 0x20, 0x40, 0x80, 0x35, 0x00, 0xc0,
-	0x1c, 0x32, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82,
+	0x01, 0x78, 0x80, 0x08, 0xe2, 0x00, 0xca, 0xe3,
+	0x05, 0x00, 0x00, 0xe3, 0x06, 0x01, 0x00, 0xe2,
+	0x0d, 0x61, 0x4d, 0xd0, 0x00, 0xa0, 0xf0, 0x70,
+	0x3e, 0x80, 0x30, 0x20, 0x35, 0x00, 0xc0, 0x1c,
+	0x32, 0x00, 0x00, 0x1e, 0x1a, 0x36, 0x80, 0xa0,
+	0x70, 0x38, 0x1f, 0x40, 0x30, 0x20, 0x35, 0x00,
+	0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1a, 0x1a, 0x1d,
+	0x00, 0x80, 0x51, 0xd0, 0x1c, 0x20, 0x40, 0x80,
+	0x35, 0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7,
 };
 
 static uint8_t hdmi_edid_4k_600_with_displayid[512] = {