igt_eld: add igt_is_igt

1/2

---
 lib/igt_eld.c | 23 +++++++++++++++++++++++
 lib/igt_eld.h |  1 +
 2 files changed, 24 insertions(+)
index 16c4ac06c6f6..640496b0a160 100644
@@ -262,3 +262,26 @@ bool eld_has_igt(void)
 	struct eld_entry eld;
 	return eld_get_igt(&eld);
 }
+
+/** eld_is_igt: check whether the ELD blob comes from an IGT EDID */
+bool eld_is_igt(const char *eld, size_t eld_size)
+{
+	char name[17];
+	int name_size;
+
+	igt_assert_f(eld_size >= 20 && eld_size <= 256,
+		     "Invalid ELD size: %zu\n", eld_size);
+
+	name_size = eld[4] & 0x1F;
+	igt_assert_f(name_size <= 16 && 20 + name_size <= eld_size,
+		     "Invalid monitor name size in ELD: %d\n", name_size);
+	if (name_size == 0) {
+		igt_debug("ELD doesn't contain a monitor name\n");
+		return false;
+	}
+
+	memcpy(name, &eld[20], name_size);
+	name[name_size] = '\0';
+	igt_debug("Checking ELD with monitor name: %s\n", name);
+	return strcmp(name, "IGT") == 0;
+}

index 7c4489f054f1..36f000abe3f9 100644
@@ -51,5 +51,6 @@ struct eld_entry {
 
 bool eld_get_igt(struct eld_entry *eld);
 bool eld_has_igt(void);
+bool eld_is_igt(const char *eld, size_t eld_size);
 
 #endif

2.23.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_alsa.c | 93 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 81 insertions(+), 12 deletions(-)
index 5b5980a94888..e1836be7cdd5 100644
@@ -31,6 +31,7 @@
 #include "igt_alsa.h"
 #include "igt_aux.h"
 #include "igt_core.h"
+#include "igt_eld.h"
 
 #define HANDLES_MAX	8
 

@@ -105,6 +106,68 @@ struct alsa *alsa_init(void)
 	return alsa;
 }
 
+static bool alsa_dev_has_igt_eld(snd_ctl_t *ctl, int dev)
+{
+	snd_hctl_t *handle;
+	snd_hctl_elem_t *elem;
+	snd_ctl_elem_info_t *info;
+	snd_ctl_elem_value_t *value;
+	const char *name;
+	snd_ctl_elem_type_t type;
+	unsigned int count;
+	const char *eld;
+	bool is_igt, eld_found;
+
+	igt_assert(snd_hctl_open_ctl(&handle, ctl) == 0);
+	igt_assert(snd_hctl_load(handle) == 0);
+	igt_assert(snd_ctl_elem_info_malloc(&info) == 0);
+	igt_assert(snd_ctl_elem_value_malloc(&value) == 0);
+
+	is_igt = eld_found = false;
+	for (elem = snd_hctl_first_elem(handle); elem;
+	     elem = snd_hctl_elem_next(elem)) {
+		igt_assert(snd_hctl_elem_info(elem, info) == 0);
+		name = snd_ctl_elem_info_get_name(info);
+		type = snd_ctl_elem_info_get_type(info);
+		count = snd_ctl_elem_info_get_count(info);
+
+		if (strcmp(name, "ELD") != 0)
+			continue;
+		igt_assert(type == SND_CTL_ELEM_TYPE_BYTES);
+		if (snd_ctl_elem_info_get_device(info) != dev)
+			continue;
+
+		eld_found = true;
+
+		igt_assert(snd_hctl_elem_read(elem, value) == 0);
+		if (count == 0) {
+			igt_debug("ELD found for device %s,%d, but it's empty "
+				  "(the screen is probably disconnected)\n",
+				  snd_hctl_name(handle), dev);
+			break;
+		}
+
+		igt_debug("ELD found for device %s,%d\n",
+			  snd_hctl_name(handle), dev);
+		eld = snd_ctl_elem_value_get_bytes(value);
+		is_igt = eld_is_igt(eld, count);
+		break;
+	}
+
+	if (!eld_found) {
+		/* ELDs are probably not supported */
+		igt_debug("ELD not found for device %s,%d, skipping ELD check\n",
+			  snd_hctl_name(handle), dev);
+		is_igt = true;
+	}
+
+	snd_ctl_elem_info_free(info);
+	snd_ctl_elem_value_free(value);
+	snd_hctl_free(handle);
+
+	return is_igt;
+}
+
 static char *alsa_resolve_indentifier(const char *device_name, int skip)
 {
 	snd_ctl_card_info_t *card_info;

@@ -148,7 +211,6 @@ static char *alsa_resolve_indentifier(const char *device_name, int skip)
 		}
 
 		dev = -1;
-
 		do {
 			ret = snd_ctl_pcm_next_device(handle, &dev);
 			if (ret < 0 || dev < 0)

@@ -167,21 +229,28 @@ static char *alsa_resolve_indentifier(const char *device_name, int skip)
 
 			ret = strncmp(device_name, pcm_name,
 				      strlen(device_name));
+			if (ret != 0)
+				continue;
 
-			if (ret == 0) {
-				if (skip > 0) {
-					skip--;
-					continue;
-				}
+			if (!alsa_dev_has_igt_eld(handle, dev)) {
+				igt_debug("Device hw:%d,%d matches the name "
+					  "but doesn't have an IGT ELD\n",
+					  card, dev);
+				continue;
+			}
 
-				igt_debug("Matched device \"%s\"\n", pcm_name);
+			if (skip > 0) {
+				skip--;
+				continue;
+			}
 
-				snprintf(name, sizeof(name), "hw:%d,%d", card,
-					 dev);
+			igt_debug("Matched device \"%s\" (hw:%d,%d)\n",
+				  pcm_name, card, dev);
 
-				identifier = strdup(name);
-				goto resolved;
-			}
+			snprintf(name, sizeof(name), "hw:%d,%d", card,
+				 dev);
+			identifier = strdup(name);
+			goto resolved;
 		} while (dev >= 0);
 
 		snd_ctl_close(handle);

2.23.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_eld.c | 23 +++++++++++++++++++++++
 lib/igt_eld.h |  1 +
 2 files changed, 24 insertions(+)
index 16c4ac06c6f6..640496b0a160 100644
@@ -262,3 +262,26 @@ bool eld_has_igt(void)
        struct eld_entry eld;
        return eld_get_igt(&eld);
 }
+
+/** eld_is_igt: check whether the ELD blob comes from an IGT EDID */
+bool eld_is_igt(const char *eld, size_t eld_size)

+{
+       char name[17];
+       int name_size;
+
+       igt_assert_f(eld_size >= 20 && eld_size <= 256,
+                    "Invalid ELD size: %zu\n", eld_size);
+
+       name_size = eld[4] & 0x1F;
+       igt_assert_f(name_size <= 16 && 20 + name_size <= eld_size,
+                    "Invalid monitor name size in ELD: %d\n", name_size);

+       if (name_size == 0) {
+               igt_debug("ELD doesn't contain a monitor name\n");
+               return false;
+       }
+
+       memcpy(name, &eld[20], name_size);
+       name[name_size] = '\0';
+       igt_debug("Checking ELD with monitor name: %s\n", name);
+       return strcmp(name, "IGT") == 0;

+/** eld_is_igt: check whether the ELD blob comes from an IGT EDID */
+bool eld_is_igt(const char *eld, size_t eld_size)
+{
+	char name[17];
+	int name_size;
+
+	igt_assert_f(eld_size >= 20 && eld_size <= 256,
+		     "Invalid ELD size: %zu\n", eld_size);

+
+	name_size = eld[4] & 0x1F;
+	igt_assert_f(name_size <= 16 && 20 + name_size <= eld_size,
+		     "Invalid monitor name size in ELD: %d\n", name_size);
+	if (name_size == 0) {
+		igt_debug("ELD doesn't contain a monitor name\n");
+		return false;
+	}
+
+	memcpy(name, &eld[20], name_size);

 lib/igt_eld.c | 29 +++++++++++++++++++++++++++++
 lib/igt_eld.h |  1 +
 2 files changed, 30 insertions(+)
index 16c4ac06c6f6..d565a4c04773 100644
@@ -262,3 +262,32 @@ bool eld_has_igt(void)
 	struct eld_entry eld;
 	return eld_get_igt(&eld);
 }
+
+#define ELD_MAX_SIZE 256
+#define MONITOR_NAME_OFFSET 20
+#define MONITOR_NAME_MAX_SIZE 16
+
+/** eld_is_igt: check whether the ELD blob comes from an IGT EDID */
+bool eld_is_igt(const char *eld, size_t eld_size)
+{
+	char name[MONITOR_NAME_MAX_SIZE + 1];
+	int name_size;
+
+	igt_assert_f(eld_size >= MONITOR_NAME_OFFSET &&
+		     eld_size <= ELD_MAX_SIZE,
+		     "Invalid ELD size: %zu\n", eld_size);
+
+	name_size = eld[4] & 0x1F;
+	igt_assert_f(name_size <= MONITOR_NAME_MAX_SIZE &&
+		     MONITOR_NAME_OFFSET + name_size <= eld_size,
+		     "Invalid monitor name size in ELD: %d\n", name_size);
+	if (name_size == 0) {
+		igt_debug("ELD doesn't contain a monitor name\n");
+		return false;
+	}
+
+	memcpy(name, &eld[MONITOR_NAME_OFFSET], name_size);
+	name[name_size] = '\0';
+	igt_debug("Checking ELD with monitor name: %s\n", name);
+	return strcmp(name, "IGT") == 0;
+}

index 7c4489f054f1..36f000abe3f9 100644
@@ -51,5 +51,6 @@ struct eld_entry {
 
 bool eld_get_igt(struct eld_entry *eld);
 bool eld_has_igt(void);
+bool eld_is_igt(const char *eld, size_t eld_size);
 
 #endif

 lib/igt_eld.c | 29 +++++++++++++++++++++++++++++
 lib/igt_eld.h |  1 +
 2 files changed, 30 insertions(+)
index 16c4ac06c6f6..d565a4c04773 100644
@@ -262,3 +262,32 @@ bool eld_has_igt(void)
 	struct eld_entry eld;
 	return eld_get_igt(&eld);
 }
+
+#define ELD_MAX_SIZE 256
+#define MONITOR_NAME_OFFSET 20
+#define MONITOR_NAME_MAX_SIZE 16
+
+/** eld_is_igt: check whether the ELD blob comes from an IGT EDID */
+bool eld_is_igt(const char *eld, size_t eld_size)
+{
+	char name[MONITOR_NAME_MAX_SIZE + 1];
+	int name_size;
+
+	igt_assert_f(eld_size >= MONITOR_NAME_OFFSET &&
+		     eld_size <= ELD_MAX_SIZE,
+		     "Invalid ELD size: %zu\n", eld_size);
+
+	name_size = eld[4] & 0x1F;
+	igt_assert_f(name_size <= MONITOR_NAME_MAX_SIZE &&
+		     MONITOR_NAME_OFFSET + name_size <= eld_size,
+		     "Invalid monitor name size in ELD: %d\n",

+	if (name_size == 0) {
+		igt_debug("ELD doesn't contain a monitor name\n");
+		return false;
+	}
+
+	memcpy(name, &eld[MONITOR_NAME_OFFSET], name_size);
+	name[name_size] = '\0';
+	igt_debug("Checking ELD with monitor name: %s\n", name);
+	return strcmp(name, "IGT") == 0;
+}

index 7c4489f054f1..36f000abe3f9 100644
@@ -51,5 +51,6 @@ struct eld_entry {
 
 bool eld_get_igt(struct eld_entry *eld);
 bool eld_has_igt(void);
+bool eld_is_igt(const char *eld, size_t eld_size);
 
 #endif
--


igt_eld: add igt_is_igt

Simon Ser

Simon Ser

Chris Wilson

Patchwork

Andi Shyti

Simon Ser

Ser, Simon

Patchwork

Patchwork

Patchwork