[igt-dev] [PATCH i-g-t v4 07/10] lib/igt_chamelium: set EDID serial

Simon Ser
2019-06-25T13:14:34Z

Set a different EDID serial string for each Chamelium port, so that we can
easily tell which DRM connector maps to a Chamelium port.

Signed-off-by: Simon Ser <simon.ser@intel.com>
---
lib/igt_chamelium.c | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index 467f1a458516..959a14333ed9 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c
@@ -82,7 +82,9 @@
*/

struct chamelium_edid {
- struct edid *raw;
+ struct chamelium *chamelium;
+ struct edid *base;
+ struct edid *raw[CHAMELIUM_MAX_PORTS];
int ids[CHAMELIUM_MAX_PORTS];
struct igt_list link;
};
@@ -566,13 +568,33 @@ struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium,
size_t edid_size = edid_get_size(edid);

chamelium_edid = calloc(1, sizeof(struct chamelium_edid));
- chamelium_edid->raw = malloc(edid_size);
- memcpy(chamelium_edid->raw, edid, edid_get_size(edid));
+ chamelium_edid->chamelium = chamelium;
+ chamelium_edid->base = malloc(edid_size);
+ memcpy(chamelium_edid->base, edid, edid_get_size(edid));
igt_list_add(&chamelium_edid->link, &chamelium->edids);

return chamelium_edid;
}

+/**
+ * chamelium_port_tag_edid: tag the EDID with the provided Chamelium port.
+ */
+static void chamelium_port_tag_edid(struct chamelium_port *port,
+ struct edid *edid)
+{
+ uint32_t *serial;
+
+ /* Product code: Chamelium */
+ edid->prod_code[0] = 'C';
+ edid->prod_code[1] = 'H';
+
+ /* Serial: Chamelium port ID */
+ serial = (uint32_t *) &edid->serial;
+ *serial = port->id;
+
+ edid_update_checksum(edid);
+}
+
/**
* chamelium_edid_get_raw: get the raw EDID
* @edid: the Chamelium EDID
@@ -587,7 +609,17 @@ struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium,
const struct edid *chamelium_edid_get_raw(struct chamelium_edid *edid,
struct chamelium_port *port)
{
- return edid->raw;
+ size_t port_index = port - edid->chamelium->ports;
+ size_t edid_size;
+
+ if (!edid->raw[port_index]) {
+ edid_size = edid_get_size(edid->base);
+ edid->raw[port_index] = malloc(edid_size);
+ memcpy(edid->raw[port_index], edid->base, edid_size);
+ chamelium_port_tag_edid(port, edid->raw[port_index]);
+ }
+
+ return edid->raw[port_index];
}

/**
@@ -1943,8 +1975,9 @@ void chamelium_deinit(struct chamelium *chamelium)
for (i = 0; i < CHAMELIUM_MAX_PORTS; i++) {
if (pos->ids[i])
chamelium_destroy_edid(chamelium, pos->ids[i]);
+ free(pos->raw[i]);
}
- free(pos->raw);
+ free(pos->base);
free(pos);
}

--
2.22.0