Unverified Commit b17ade59 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/tests: edid: Update CTA-861 HDMI Vendor Specific Data Block 



For some reason, the HDMI VSDBs in our kunit EDIDs had a length longer
than expected.

While this was harmless, we should get rid of it to make it somewhat
predictable.

Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20250625-drm-update-edid-v1-2-2d963743ab9e@kernel.org


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 2bf85c45

drivers/gpu/drm/tests/drm_kunit_edid.h

+40 −45
Original line number Diff line number Diff line
@@ -73,14 +73,14 @@ static const unsigned char test_edid_dvi_1080p[] = { 
 * 46 1e 46 0f 00 0a 20 20 20 20 20 20 00 00 00 10

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 92

 *

 * 02 03 1b 81 e3 05 00 20 41 10 e2 00 4a 6d 03 0c

 * 00 12 34 00 14 20 00 00 00 00 00 00 00 00 00 00

 * 02 03 15 81 e3 05 00 20 41 10 e2 00 4a 67 03 0c

 * 00 12 34 00 14 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e4

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10

 *

 * ----------------

 *
@@ -135,8 +135,7 @@ static const unsigned char test_edid_dvi_1080p[] = { 
 *   Vendor-Specific Data Block (HDMI), OUI 00-0C-03:

 *     Source physical address: 1.2.3.4

 *     Maximum TMDS clock: 100 MHz

 *     Extended HDMI video details:

 * Checksum: 0xe4  Unused space in Extension Block: 100 bytes

 * Checksum: 0x10  Unused space in Extension Block: 106 bytes

 */

static const unsigned char test_edid_hdmi_1080p_rgb_max_100mhz[] = {

	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00,
@@ -149,9 +148,9 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_100mhz[] = { 
	0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32,

	0x46, 0x1e, 0x46, 0x0f, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, 0x02, 0x03, 0x1b, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x6d, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x14, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, 0x02, 0x03, 0x15, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x67, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x14, 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,
@@ -160,7 +159,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_100mhz[] = { 
	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, 0xe4

	0x00, 0x00, 0x00, 0x10

};



/*
@@ -175,14 +174,14 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_100mhz[] = { 
 * 46 1e 46 0f 00 0a 20 20 20 20 20 20 00 00 00 10

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 92

 *

 * 02 03 1b 81 e3 05 00 20 41 10 e2 00 4a 6d 03 0c

 * 00 12 34 00 28 20 00 00 00 00 00 00 00 00 00 00

 * 02 03 15 81 e3 05 00 20 41 10 e2 00 4a 67 03 0c

 * 00 12 34 00 28 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 d0

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fc

 *

 * ----------------

 *
@@ -237,8 +236,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_100mhz[] = { 
 *   Vendor-Specific Data Block (HDMI), OUI 00-0C-03:

 *     Source physical address: 1.2.3.4

 *     Maximum TMDS clock: 200 MHz

 *     Extended HDMI video details:

 * Checksum: 0xd0  Unused space in Extension Block: 100 bytes

 * Checksum: 0xfc  Unused space in Extension Block: 106 bytes

 */

static const unsigned char test_edid_hdmi_1080p_rgb_max_200mhz[] = {

	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00,
@@ -251,9 +249,9 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_200mhz[] = { 
	0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32,

	0x46, 0x1e, 0x46, 0x0f, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, 0x02, 0x03, 0x1b, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x6d, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x28, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, 0x02, 0x03, 0x15, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x67, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x28, 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,
@@ -262,7 +260,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_200mhz[] = { 
	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, 0xd0

	0x00, 0x00, 0x00, 0xfc

};



/*
@@ -277,14 +275,14 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_200mhz[] = { 
 * 46 1e 46 0f 00 0a 20 20 20 20 20 20 00 00 00 10

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 92

 *

 * 02 03 1b 81 e3 05 00 20 41 10 e2 00 4a 6d 03 0c

 * 00 12 34 00 28 20 00 00 00 00 00 00 00 00 00 00

 * 02 03 15 81 e3 05 00 20 41 10 e2 00 4a 67 03 0c

 * 00 12 34 00 44 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 d0

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e0

 *

 * ----------------

 *
@@ -339,8 +337,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_200mhz[] = { 
 *   Vendor-Specific Data Block (HDMI), OUI 00-0C-03:

 *     Source physical address: 1.2.3.4

 *     Maximum TMDS clock: 340 MHz

 *     Extended HDMI video details:

 * Checksum: 0xd0  Unused space in Extension Block: 100 bytes

 * Checksum: 0xe0  Unused space in Extension Block: 106 bytes

 */

static const unsigned char test_edid_hdmi_1080p_rgb_max_340mhz[] = {

	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00,
@@ -353,9 +350,9 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_340mhz[] = { 
	0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32,

	0x46, 0x1e, 0x46, 0x0f, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, 0x02, 0x03, 0x1b, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x6d, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, 0x02, 0x03, 0x15, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x67, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x44, 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,
@@ -364,7 +361,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_340mhz[] = { 
	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, 0xd0

	0x00, 0x00, 0x00, 0xe0

};



/*
@@ -379,14 +376,14 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_340mhz[] = { 
 * 46 1e 46 0f 00 0a 20 20 20 20 20 20 00 00 00 10

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 7a

 *

 * 02 03 1b b1 e3 05 00 20 41 10 e2 00 ca 6d 03 0c

 * 00 12 34 78 28 20 00 00 00 00 00 00 00 00 00 00

 * 02 03 15 b1 e3 05 00 20 41 10 e2 00 ca 67 03 0c

 * 00 12 34 78 28 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 a8

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 d4

 *

 * ----------------

 *
@@ -447,8 +444,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_max_340mhz[] = { 
 *     DC_30bit

 *     DC_Y444

 *     Maximum TMDS clock: 200 MHz

 *     Extended HDMI video details:

 * Checksum: 0xa8  Unused space in Extension Block: 100 bytes

 * Checksum: 0xd4  Unused space in Extension Block: 106 bytes

 */

static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz[] = {

	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00,
@@ -461,9 +457,9 @@ static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz[] = { 
	0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32,

	0x46, 0x1e, 0x46, 0x0f, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x7a, 0x02, 0x03, 0x1b, 0xb1,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0xca, 0x6d, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x78, 0x28, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x7a, 0x02, 0x03, 0x15, 0xb1,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0xca, 0x67, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x78, 0x28, 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,
@@ -472,7 +468,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz[] = { 
	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, 0xa8

	0x00, 0x00, 0x00, 0xd4

};



/*
@@ -487,14 +483,14 @@ static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz[] = { 
 * 46 1e 46 0f 00 0a 20 20 20 20 20 20 00 00 00 10

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 8a

 *

 * 02 03 1b b1 e3 05 00 20 41 10 e2 00 ca 6d 03 0c

 * 00 12 34 78 44 20 00 00 00 00 00 00 00 00 00 00

 * 02 03 15 b1 e3 05 00 20 41 10 e2 00 ca 67 03 0c

 * 00 12 34 78 44 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 8c

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 b8

 *

 * ----------------

 *
@@ -555,8 +551,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz[] = { 
 *     DC_30bit

 *     DC_Y444

 *     Maximum TMDS clock: 340 MHz

 *     Extended HDMI video details:

 * Checksum: 0x8c  Unused space in Extension Block: 100 bytes

 * Checksum: 0xb8  Unused space in Extension Block: 106 bytes

 */

static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz[] = {

	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00,
@@ -569,9 +564,9 @@ static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz[] = { 
	0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32,

	0x46, 0x1e, 0x46, 0x0f, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a, 0x02, 0x03, 0x1b, 0xb1,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0xca, 0x6d, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x78, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a, 0x02, 0x03, 0x15, 0xb1,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0xca, 0x67, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x78, 0x44, 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,
@@ -580,7 +575,7 @@ static const unsigned char test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz[] = { 
	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, 0x8c

	0x00, 0x00, 0x00, 0xb8

};



/*