Skip to contentSkip to conversation

4K and audio HDMI EDID injection

PATCH Superseded Marius Vlad 1 participant 4 messages Feb 8, 2016 Library code

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover 4K and audio HDMI EDID injection

This series adds a test for HDMI injection (4K and audio), and it needs https://patchwork.freedesktop.org/series/3007/.

v2:

Use a proper subject.

Added speaker data block and check that we get indeed a valid ELD for audio injection, otherwise we can not tell if the audio injection succeeded.

Marius Vlad (3):
lib/igt_kms: Add support for 4K and audio HDMI EDID injection. tests/kms_hdmi_inject: Test to make use of HDMI injection
capabilities.
lib/igt_kms: Remove check against HDMI connectors on HSW and BDW.

 lib/igt_kms.c           | 191 +++++++++++++++++++++++++++++++++++++--
 lib/igt_kms.h           |   2 +
 tests/Makefile.sources  |   1 +
 tests/kms_hdmi_inject.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 421 insertions(+), 9 deletions(-)
 create mode 100644 tests/kms_hdmi_inject.c
Signature · 6 lines
2.7.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v2 1/3 lib/igt_kms: Add support for 4K and audio HDMI EDID injection.

---
 lib/igt_kms.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/igt_kms.h |   2 +
 2 files changed, 183 insertions(+)
lib/igt_kms.c +181 -0
index 90c8da7..ed40c48 100644
@@ -858,6 +858,187 @@ void kmstest_edid_add_3d(const unsigned char *edid, size_t length,
 }
 
 /**
+ * kmstest_edid_add_4k:
+ * @edid: an existing valid edid block
+ * @length: length of @edid
+ * @new_edid_ptr: pointer to where the new edid will be placed
+ * @new_length: pointer to the size of the new edid
+ *
+ * Makes a copy of an existing edid block and adds an extension indicating
+ * a HDMI 4K mode in vsdb.
+ */
+void kmstest_edid_add_4k(const unsigned char *edid, size_t length,
+			 unsigned char *new_edid_ptr[], size_t *new_length)
+{
+	unsigned char *new_edid;
+	int n_extensions;
+	char sum = 0;
+	int pos;
+	int i;
+	char cea_header_len = 4, video_block_len = 6, vsdb_block_len = 12;
+
+	igt_assert(new_edid_ptr != NULL && new_length != NULL);
+
+	*new_length = length + 128;
+
+	new_edid = calloc(*new_length, sizeof(char));
+	memcpy(new_edid, edid, length);
+	*new_edid_ptr = new_edid;
+
+	n_extensions = new_edid[126];
+	n_extensions++;
+	new_edid[126] = n_extensions;
+
+	/* recompute checksum */
+	for (i = 0; i < 127; i++) {
+		sum = sum + new_edid[i];
+	}
+	new_edid[127] = 256 - sum;
+
+	/* add a cea-861 extension block */
+	pos = length;
+	new_edid[pos++] = 0x2;
+	new_edid[pos++] = 0x3;
+	new_edid[pos++] = cea_header_len + video_block_len + vsdb_block_len;
+	new_edid[pos++] = 0x0;
+
+	/* video block (id | length) */
+	new_edid[pos++] = 2 << 5 | (video_block_len - 1);
+	new_edid[pos++] = 32 | 0x80; /* 1080p @ 24Hz | (native)*/
+	new_edid[pos++] = 5;         /* 1080i @ 60Hz */
+	new_edid[pos++] = 20;        /* 1080i @ 50Hz */
+	new_edid[pos++] = 4;         /* 720p @ 60Hz*/
+	new_edid[pos++] = 19;        /* 720p @ 50Hz*/
+
+	/* vsdb block ( id | length ) */
+	new_edid[pos++] = 3 << 5 | (vsdb_block_len - 1);
+	/* registration id */
+	new_edid[pos++] = 0x3;
+	new_edid[pos++] = 0xc;
+	new_edid[pos++] = 0x0;
+	/* source physical address */
+	new_edid[pos++] = 0x10;
+	new_edid[pos++] = 0x00;
+	/* Supports_AI ... etc */
+	new_edid[pos++] = 0x00;
+	/* Max TMDS Clock */
+	new_edid[pos++] = 0x00;
+	/* Latency present, HDMI Video Present */
+	new_edid[pos++] = 0x20;
+	/* HDMI Video */
+	new_edid[pos++] = 0x00; /* 3D present */
+
+	/* HDMI MODE LEN -- how many entries */
+	new_edid[pos++] = 0x20;
+	/* 2160p, specified as short descriptor */
+	new_edid[pos++] = 0x01;
+
+
+	/* checksum */
+	sum = 0;
+	for (i = 0; i < 127; i++) {
+		sum = sum + new_edid[length + i];
+	}
+	new_edid[length + 127] = 256 - sum;
+}
+
+/**
+ * kmstest_edid_add_audio:
+ * @edid: an existing valid edid block
+ * @length: length of @edid
+ * @new_edid_ptr: pointer to where the new edid will be placed
+ * @new_length: pointer to the size of the new edid
+ *
+ * Makes a copy of an existing edid block and adds an extension indicating
+ * basic audio support and speaker data block.
+ *
+ */
+void kmstest_edid_add_audio(const unsigned char *edid, size_t length,
+			    unsigned char *new_edid_ptr[], size_t *new_length)
+{
+	unsigned char *new_edid;
+	int n_extensions;
+	char sum = 0;
+	int pos;
+	int i;
+	char cea_header_len = 4, video_block_len = 6, vsdb_block_len = 10;
+	char audio_block_len = 4, spkr_block_len = 4;
+
+	igt_assert(new_edid_ptr != NULL && new_length != NULL);
+
+	*new_length = length + 128;
+
+	new_edid = calloc(*new_length, sizeof(char));
+	memcpy(new_edid, edid, length);
+	*new_edid_ptr = new_edid;
+
+	n_extensions = new_edid[126];
+	n_extensions++;
+	new_edid[126] = n_extensions;
+
+	/* recompute checksum */
+	for (i = 0; i < 127; i++) {
+		sum = sum + new_edid[i];
+	}
+	new_edid[127] = 256 - sum;
+
+	/* add a cea-861 extension block */
+	pos = length;
+	new_edid[pos++] = 0x2;
+	new_edid[pos++] = 0x3;
+	new_edid[pos++] = cea_header_len + audio_block_len +
+			  video_block_len + vsdb_block_len + spkr_block_len;
+	new_edid[pos++] = (1 << 6); /* support basic audio */
+
+	/* audio block, short audio block descriptors  */
+	new_edid[pos++] = (1 << 5) | (audio_block_len - 1);
+	new_edid[pos++] = 0x09; /* Audio Format, PCM */
+	new_edid[pos++] = 0x07; /* Frequency, 32, 44.1, 48kHz  */
+	new_edid[pos++] = 0x07; /* Bit Rate 16, 20, 24 bit */
+
+	/* video block (id | length) */
+	new_edid[pos++] = 2 << 5 | (video_block_len - 1);
+	new_edid[pos++] = 32 | 0x80; /* 1080p @ 24Hz | (native)*/
+	new_edid[pos++] = 5;         /* 1080i @ 60Hz */
+	new_edid[pos++] = 20;        /* 1080i @ 50Hz */
+	new_edid[pos++] = 4;         /* 720p @ 60Hz*/
+	new_edid[pos++] = 19;        /* 720p @ 50Hz*/
+
+
+	/* vsdb block ( id | length ) -- need vsdb as well
+	 * otherwise the kernel will fallback to lower clock modes */
+	new_edid[pos++] = 3 << 5 | (vsdb_block_len - 1);
+	/* registration id */
+	new_edid[pos++] = 0x3;
+	new_edid[pos++] = 0xc;
+	new_edid[pos++] = 0x0;
+	/* source physical address */
+	new_edid[pos++] = 0x10;
+	new_edid[pos++] = 0x00;
+	/* Supports_AI ... etc */
+	new_edid[pos++] = 0x00;
+	/* Max TMDS Clock */
+	new_edid[pos++] = 0x00;
+	/* Latency present, HDMI Video Present */
+	new_edid[pos++] = 0x20;
+	/* HDMI Video */
+	new_edid[pos++] = 0x00; /* 3D present */
+
+	/* speaker data block */
+	new_edid[pos++] = (4 << 5) | (spkr_block_len - 1);
+	new_edid[pos++] = (1 << 5);
+	new_edid[pos++] = 0x00;
+	new_edid[pos++] = 0x00;
+
+	/* checksum */
+	sum = 0;
+	for (i = 0; i < 127; i++) {
+		sum = sum + new_edid[length + i];
+	}
+	new_edid[length + 127] = 256 - sum;
+}
+
+/**
  * kmstest_unset_all_crtcs:
  * @drm_fd: the DRM fd
  * @resources: libdrm resources pointer
lib/igt_kms.h +2 -0
index 3f7add5..1f79f55 100644
@@ -132,6 +132,8 @@ enum kmstest_force_connector_state {
 bool kmstest_force_connector(int fd, drmModeConnector *connector,
 			     enum kmstest_force_connector_state state);
 void kmstest_edid_add_3d(const unsigned char *edid, size_t length, unsigned char *new_edid_ptr[], size_t *new_length);
+void kmstest_edid_add_4k(const unsigned char *edid, size_t length, unsigned char *new_edid_ptr[], size_t *new_length);
+void kmstest_edid_add_audio(const unsigned char *edid, size_t length, unsigned char *new_edid_ptr[], size_t *new_length);
 void kmstest_force_edid(int drm_fd, drmModeConnector *connector,
 			const unsigned char *edid, size_t length);
 
Signature · 6 lines
2.7.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 2/3 tests/kms_hdmi_inject: Test to make use of HDMI injection capabilities.

In reply to Marius Vlad
---
 tests/Makefile.sources  |   1 +
 tests/kms_hdmi_inject.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 tests/kms_hdmi_inject.c
tests/Makefile.sources +1 -0
index d431ebf..13c2552 100644
@@ -170,6 +170,7 @@ TESTS_progs = \
 	gen3_render_tiledy_blits \
 	gen7_forcewake_mt \
 	kms_3d \
+	kms_hdmi_inject \
 	kms_fence_pin_leak \
 	kms_force_connector_basic \
 	kms_pwrite_crc \
tests/kms_hdmi_inject.c new file +236 -0

236 lines not on this page · raw message

Signature · 6 lines
2.7.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH v2 3/3 lib/igt_kms: Remove check against HDMI connectors on HSW and BDW.

In reply to Marius Vlad
---
 lib/igt_kms.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
lib/igt_kms.c +1 -9
index ed40c48..5c911d5 100644
@@ -384,16 +384,8 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector,
 	const char *value;
 	int debugfs_fd, ret, len;
 	drmModeConnector *temp;
-	uint32_t devid;
 
-	devid = intel_get_drm_devid(drm_fd);
-
-	/* forcing hdmi or dp connectors on HSW and BDW doesn't currently work,
-	 * so fail early to allow the test to skip if required */
-	if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
-	     connector->connector_type == DRM_MODE_CONNECTOR_HDMIB ||
-	     connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
-	    && (IS_HASWELL(devid) || IS_BROADWELL(devid)))
+	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
 		return false;
 
 	switch (state) {
Signature · 6 lines
2.7.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx