Preliminary work for automagical Chamelium port mapping

cover

 lib/igt_chamelium.c   | 34 +++++++++++++++-------------------
 lib/igt_chamelium.h   |  8 ++++++--
 tests/kms_chamelium.c | 11 +++--------
 3 files changed, 24 insertions(+), 29 deletions(-)
---
 tests/kms_chamelium.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
index 36e92e975d64..03ebbd9c4b20 100644
@@ -36,13 +36,12 @@
 #include <stdatomic.h>
 
 enum test_edid {
-	TEST_EDID_CHAMELIUM_DEFAULT,
 	TEST_EDID_BASE,
 	TEST_EDID_ALT,
 	TEST_EDID_HDMI_AUDIO,
 	TEST_EDID_DP_AUDIO,
 };
-#define TEST_EDID_COUNT 5
+#define TEST_EDID_COUNT 4
 
 typedef struct {
 	struct chamelium *chamelium;

@@ -2045,9 +2044,6 @@ test_hpd_storm_disable(data_t *data, struct chamelium_port *port, int width)
 static const unsigned char *get_edid(enum test_edid edid)
 {
 	switch (edid) {
-	case TEST_EDID_CHAMELIUM_DEFAULT:
-		igt_assert(0); /* we don't have the raw data for this one */
-		return NULL;
 	case TEST_EDID_BASE:
 		return igt_kms_get_base_edid();
 	case TEST_EDID_ALT:

@@ -2089,8 +2085,7 @@ igt_main
 		data.ports = chamelium_get_ports(data.chamelium,
 						 &data.port_count);
 
-		data.edids[TEST_EDID_CHAMELIUM_DEFAULT] = CHAMELIUM_DEFAULT_EDID;
-		for (i = 1; i < TEST_EDID_COUNT; ++i) {
+		for (i = 0; i < TEST_EDID_COUNT; ++i) {
 			data.edids[i] = chamelium_new_edid(data.chamelium,
 							   get_edid(i));
 		}

2.22.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/kms_chamelium.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
index 36e92e975d64..03ebbd9c4b20 100644
@@ -36,13 +36,12 @@
 #include <stdatomic.h>
 
 enum test_edid {
-	TEST_EDID_CHAMELIUM_DEFAULT,
 	TEST_EDID_BASE,
 	TEST_EDID_ALT,
 	TEST_EDID_HDMI_AUDIO,
 	TEST_EDID_DP_AUDIO,
 };
-#define TEST_EDID_COUNT 5
+#define TEST_EDID_COUNT 4
 
 typedef struct {
 	struct chamelium *chamelium;

@@ -2045,9 +2044,6 @@ test_hpd_storm_disable(data_t *data, struct chamelium_port *port, int width)
 static const unsigned char *get_edid(enum test_edid edid)
 {
 	switch (edid) {
-	case TEST_EDID_CHAMELIUM_DEFAULT:
-		igt_assert(0); /* we don't have the raw data for this one */
-		return NULL;
 	case TEST_EDID_BASE:
 		return igt_kms_get_base_edid();
 	case TEST_EDID_ALT:

@@ -2089,8 +2085,7 @@ igt_main
 		data.ports = chamelium_get_ports(data.chamelium,
 						 &data.port_count);
 
-		data.edids[TEST_EDID_CHAMELIUM_DEFAULT] = CHAMELIUM_DEFAULT_EDID;
-		for (i = 1; i < TEST_EDID_COUNT; ++i) {
+		for (i = 0; i < TEST_EDID_COUNT; ++i) {
 			data.edids[i] = chamelium_new_edid(data.chamelium,
 							   get_edid(i));
 		}

---
 lib/igt_chamelium.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
index eaf3b5b07097..0c44e56cad86 100644
@@ -118,7 +118,7 @@ struct chamelium {
 
 	int drm_fd;
 
-	struct chamelium_edid *edids;
+	struct igt_list edids;
 	struct chamelium_port *ports;
 	int port_count;
 };

@@ -552,12 +552,8 @@ int chamelium_new_edid(struct chamelium *chamelium,
 	memset(allocated_edid, 0, sizeof(*allocated_edid));
 
 	allocated_edid->id = edid_id;
-	igt_list_init(&allocated_edid->link);
 
-	if (chamelium->edids)
-		igt_list_add(&chamelium->edids->link, &allocated_edid->link);
-	else
-		chamelium->edids = allocated_edid;
+	igt_list_add(&allocated_edid->link, &chamelium->edids);
 
 	return edid_id;
 }

@@ -1850,6 +1846,7 @@ struct chamelium *chamelium_init(int drm_fd)
 
 	memset(chamelium, 0, sizeof(*chamelium));
 	chamelium->drm_fd = drm_fd;
+	igt_list_init(&chamelium->edids);
 
 	/* Setup the libxmlrpc context */
 	xmlrpc_env_init(&chamelium->env);

@@ -1901,7 +1898,7 @@ void chamelium_deinit(struct chamelium *chamelium)
 		chamelium_plug(chamelium, &chamelium->ports[i]);
 
 	/* Destroy any EDIDs we created to make sure we don't leak them */
-	igt_list_for_each_safe(pos, tmp, &chamelium->edids->link, link) {
+	igt_list_for_each_safe(pos, tmp, &chamelium->edids, link) {
 		chamelium_destroy_edid(chamelium, pos->id);
 		free(pos);
 	}

2.22.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_chamelium.c   | 25 ++++++++++++-------------
 lib/igt_chamelium.h   |  8 ++++++--
 tests/kms_chamelium.c |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)
index 0c44e56cad86..b83ff395d44b 100644
@@ -530,13 +530,13 @@ void chamelium_schedule_hpd_toggle(struct chamelium *chamelium,
  * Uploads and registers a new EDID with the chamelium. The EDID will be
  * destroyed automatically when #chamelium_deinit is called.
  *
- * Returns: The ID of the EDID uploaded to the chamelium.
+ * Returns: An opaque pointer to the Chamelium EDID
  */
-int chamelium_new_edid(struct chamelium *chamelium,
-		       const unsigned char *raw_edid)
+struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium,
+					  const unsigned char *raw_edid)
 {
 	xmlrpc_value *res;
-	struct chamelium_edid *allocated_edid;
+	struct chamelium_edid *chamelium_edid;
 	int edid_id;
 	struct edid *edid = (struct edid *) raw_edid;
 	size_t edid_size = sizeof(struct edid) +

@@ -548,14 +548,12 @@ int chamelium_new_edid(struct chamelium *chamelium,
 	xmlrpc_read_int(&chamelium->env, res, &edid_id);
 	xmlrpc_DECREF(res);
 
-	allocated_edid = malloc(sizeof(struct chamelium_edid));
-	memset(allocated_edid, 0, sizeof(*allocated_edid));
+	chamelium_edid = calloc(1, sizeof(struct chamelium_edid));
+	chamelium_edid->id = edid_id;
 
-	allocated_edid->id = edid_id;
+	igt_list_add(&chamelium_edid->link, &chamelium->edids);
 
-	igt_list_add(&allocated_edid->link, &chamelium->edids);
-
-	return edid_id;
+	return chamelium_edid;
 }
 
 static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)

@@ -568,7 +566,7 @@ static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)
  * chamelium_port_set_edid:
  * @chamelium: The Chamelium instance to use
  * @port: The port on the Chamelium to set the EDID on
- * @edid_id: The ID of an EDID on the chamelium created with
+ * @edid: The Chamelium EDID to set
  * #chamelium_new_edid, or 0 to disable the EDID on the port
  *
  * Sets a port on the chamelium to use the specified EDID. This does not fire a

@@ -578,10 +576,11 @@ static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)
  * change.
  */
 void chamelium_port_set_edid(struct chamelium *chamelium,
-			     struct chamelium_port *port, int edid_id)
+			     struct chamelium_port *port,
+			     struct chamelium_edid *edid)
 {
 	xmlrpc_DECREF(chamelium_rpc(chamelium, NULL, "ApplyEdid", "(ii)",
-				    port->id, edid_id));
+				    port->id, edid->id));
 }
 
 /**

index 28f726c91e83..ce9e9ced75d9 100644
@@ -59,6 +59,8 @@ struct chamelium_audio_file {
 	int channels;
 };
 
+struct chamelium_edid;
+
 /**
  * CHAMELIUM_DEFAULT_EDID: provide this ID to #chamelium_port_set_edid to use
  * the default EDID.

@@ -98,9 +100,11 @@ void chamelium_fire_hpd_pulses(struct chamelium *chamelium,
 void chamelium_schedule_hpd_toggle(struct chamelium *chamelium,
 				   struct chamelium_port *port, int delay_ms,
 				   bool rising_edge);
-int chamelium_new_edid(struct chamelium *chamelium, const unsigned char *edid);
+struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium,
+					  const unsigned char *edid);
 void chamelium_port_set_edid(struct chamelium *chamelium,
-			     struct chamelium_port *port, int edid_id);
+			     struct chamelium_port *port,
+			     struct chamelium_edid *edid);
 bool chamelium_port_get_ddc_state(struct chamelium *chamelium,
 				  struct chamelium_port *port);
 void chamelium_port_set_ddc_state(struct chamelium *chamelium,

index 03ebbd9c4b20..18f504f3bcad 100644
@@ -51,7 +51,7 @@ typedef struct {
 
 	int drm_fd;
 
-	int edids[TEST_EDID_COUNT];
+	struct chamelium_edid *edids[TEST_EDID_COUNT];
 } data_t;
 
 #define HOTPLUG_TIMEOUT 20 /* seconds */

2.22.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_chamelium.c   | 25 ++++++++++++-------------
 lib/igt_chamelium.h   |  8 ++++++--
 tests/kms_chamelium.c |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)
index 0c44e56cad86..b83ff395d44b 100644
@@ -530,13 +530,13 @@ void chamelium_schedule_hpd_toggle(struct chamelium *chamelium,
  * Uploads and registers a new EDID with the chamelium. The EDID will be
  * destroyed automatically when #chamelium_deinit is called.
  *
- * Returns: The ID of the EDID uploaded to the chamelium.
+ * Returns: An opaque pointer to the Chamelium EDID
  */
-int chamelium_new_edid(struct chamelium *chamelium,
-		       const unsigned char *raw_edid)
+struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium,
+					  const unsigned char *raw_edid)
 {
 	xmlrpc_value *res;
-	struct chamelium_edid *allocated_edid;
+	struct chamelium_edid *chamelium_edid;
 	int edid_id;
 	struct edid *edid = (struct edid *) raw_edid;
 	size_t edid_size = sizeof(struct edid) +

@@ -548,14 +548,12 @@ int chamelium_new_edid(struct chamelium *chamelium,
 	xmlrpc_read_int(&chamelium->env, res, &edid_id);
 	xmlrpc_DECREF(res);
 
-	allocated_edid = malloc(sizeof(struct chamelium_edid));
-	memset(allocated_edid, 0, sizeof(*allocated_edid));
+	chamelium_edid = calloc(1, sizeof(struct chamelium_edid));
+	chamelium_edid->id = edid_id;
 
-	allocated_edid->id = edid_id;
+	igt_list_add(&chamelium_edid->link, &chamelium->edids);
 
-	igt_list_add(&allocated_edid->link, &chamelium->edids);
-
-	return edid_id;
+	return chamelium_edid;
 }
 
 static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)

@@ -568,7 +566,7 @@ static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)
  * chamelium_port_set_edid:
  * @chamelium: The Chamelium instance to use
  * @port: The port on the Chamelium to set the EDID on
- * @edid_id: The ID of an EDID on the chamelium created with
+ * @edid: The Chamelium EDID to set
  * #chamelium_new_edid, or 0 to disable the EDID on the port
  *
  * Sets a port on the chamelium to use the specified EDID. This does not fire a

@@ -578,10 +576,11 @@ static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)
  * change.
  */
 void chamelium_port_set_edid(struct chamelium *chamelium,
-			     struct chamelium_port *port, int edid_id)
+			     struct chamelium_port *port,
+			     struct chamelium_edid *edid)
 {
 	xmlrpc_DECREF(chamelium_rpc(chamelium, NULL, "ApplyEdid", "(ii)",
-				    port->id, edid_id));
+				    port->id, edid->id));
 }
 
 /**

index 28f726c91e83..ce9e9ced75d9 100644
@@ -59,6 +59,8 @@ struct chamelium_audio_file {
 	int channels;
 };
 
+struct chamelium_edid;
+
 /**
  * CHAMELIUM_DEFAULT_EDID: provide this ID to #chamelium_port_set_edid to use
  * the default EDID.

@@ -98,9 +100,11 @@ void chamelium_fire_hpd_pulses(struct chamelium *chamelium,
 void chamelium_schedule_hpd_toggle(struct chamelium *chamelium,
 				   struct chamelium_port *port, int delay_ms,
 				   bool rising_edge);
-int chamelium_new_edid(struct chamelium *chamelium, const unsigned char *edid);
+struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium,
+					  const unsigned char *edid);
 void chamelium_port_set_edid(struct chamelium *chamelium,
-			     struct chamelium_port *port, int edid_id);
+			     struct chamelium_port *port,
+			     struct chamelium_edid *edid);
 bool chamelium_port_get_ddc_state(struct chamelium *chamelium,
 				  struct chamelium_port *port);
 void chamelium_port_set_ddc_state(struct chamelium *chamelium,

index 03ebbd9c4b20..18f504f3bcad 100644

@@ -51,7 +51,7 @@ typedef struct {
 
 	int drm_fd;
 
-	int edids[TEST_EDID_COUNT];
+	struct chamelium_edid *edids[TEST_EDID_COUNT];
 } data_t;
 
 #define HOTPLUG_TIMEOUT 20 /* seconds */


Preliminary work for automagical Chamelium port mapping

Simon Ser

Simon Ser

Martin Peres

Simon Ser

Arkadiusz Hiler

Simon Ser

Martin Peres

Patchwork

Patchwork