[PATCH i-g-t v7 29/48] lib/unigraf: Add connector and EDID configuration

Louis Chauvet
2026-02-23T12:09:24Z

As multiple connectors can be present on the DUT, add a configuration to
tell which connector is used by the Unigraf and which EDID to use on the
Unigraf.

Complete list of EDID name supported can be found in
lib/monitor_edids/{dp,hdmi}_edids.h

The configuration will look like:

[Unigraf]
Device=UCD-500 [2434C620]
Role=DisplayPort Source and Sink
Input=DP RX
Connector=DP-4
EDID=DEL_16543_DELL_P2314T_DP

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
lib/unigraf/unigraf.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-
lib/unigraf/unigraf.h | 3 ++
2 files changed, 126 insertions(+), 2 deletions(-)

diff --git a/lib/unigraf/unigraf.c b/lib/unigraf/unigraf.c
index 796848dd8fc7..549196bb90bd 100644
--- a/lib/unigraf/unigraf.c
+++ b/lib/unigraf/unigraf.c
@@ -13,7 +13,10 @@
#include "unigraf.h"
#include "TSI_types.h"
#include "TSI.h"
+#include "igt_edid.h"
+#include "igt_kms.h"
#include "igt_rc.h"
+#include "monitor_edids/monitor_edids_helper.h"

#define unigraf_debug(fmt, ...) igt_debug("TSI:%p: " fmt, unigraf_device, ##__VA_ARGS__)

@@ -46,6 +49,16 @@ static char *unigraf_connector_name;
*/
#define UNIGRAF_CONFIG_INPUT_NAME "Input"

+/**
+ * UNIGRAF_CONFIG_CONNECTOR_NAME - Key of the connector name in the configuration file
+ */
+#define UNIGRAF_CONFIG_CONNECTOR_NAME "Connector"
+
+/**
+ * UNIGRAF_CONFIG_EDID_NAME - Key of the EDID name in the configuration file
+ */
+#define UNIGRAF_CONFIG_EDID_NAME "EDID"
+
/**
* UNIGRAF_DEFAULT_ROLE_NAME - Default role name to search on the unigraf device
*/
@@ -200,6 +213,82 @@ static int unigraf_find_input(const char *request)
return -ENODEV;
}

+static void unigraf_load_default_edid(void)
+{
+ struct edid *edid = get_edid_by_name(unigraf_default_edid);
+
+ if (edid) {
+ for (int i = unigraf_get_mst_stream_max_count(); i > 0; i--)
+ unigraf_write_edid(i - 1, edid, edid_get_size(edid));
+ } else {
+ igt_warn("Impossible to find an edid named \"%s\"", unigraf_default_edid);
+ list_edid_names(IGT_LOG_WARN);
+ }
+}
+
+static void unigraf_autodetect_connector(int drm_fd)
+{
+ int newly_connected_count, already_connected_count, diff_len;
+ uint32_t *newly_connected = NULL, *already_connected = NULL;
+ drmModeConnectorPtr connector;
+ uint32_t *diff = NULL;
+
+ igt_assert(drm_fd);
+ unigraf_set_sst();
+ unigraf_hpd_deassert();
+
+ /*
+ * Hard sleep is required here as we don't know how long it will take for the device under
+ * test to properly detect the port disconnection.
+ */
+ sleep(igt_default_display_detect_timeout());
+
+ already_connected_count = igt_get_connected_connectors(drm_fd, &already_connected);
+
+ unigraf_hpd_assert();
+
+ newly_connected_count = kms_wait_for_new_connectors(&newly_connected,
+ already_connected,
+ already_connected_count,
+ drm_fd);
+
+ diff_len = get_list_diff(newly_connected, newly_connected_count,
+ already_connected, already_connected_count, &diff);
+
+ if (!diff_len) {
+ unigraf_debug("No newly connected connector, assuming that the unigraf is not connected.\n");
+ } else if (diff_len > 1) {
+ unigraf_debug("More than one new connectors connected, this is not supported by autodetection.\n");
+ } else {
+ unigraf_debug("Found one connector (%d) connected to the Unigraf\n", diff[0]);
+ connector = drmModeGetConnector(drm_fd, diff[0]);
+ igt_assert(connector);
+ igt_assert(asprintf(&unigraf_connector_name, "%s-%u",
+ kmstest_connector_type_str(connector->connector_type),
+ connector->connector_type_id) != -1);
+ drmModeFreeConnector(connector);
+ }
+
+ free(already_connected);
+ free(newly_connected);
+ free(diff);
+}
+
+/**
+ * unigraf_get_connector() - Get a DRM connector for the Unigraf device
+ * @drm_fd: DRM file descriptor
+ *
+ * Returns: A pointer to the drmModeConnector connected to the unigraf device,
+ * or NULL if the operation failed. The caller is responsible for freeing this
+ * pointer with drmModeFreeConnector().
+ */
+drmModeConnectorPtr unigraf_get_connector(int drm_fd)
+{
+ if (!unigraf_connector_name)
+ unigraf_autodetect_connector(drm_fd);
+ return igt_get_connector_from_name(drm_fd, unigraf_connector_name);
+}
+
/**
* unigraf_open_device() - Search and open a device.
* @drm_fd: File descriptor of the currently used drm device
@@ -215,6 +304,7 @@ bool unigraf_open_device(int drm_fd)
char *cfg_device = NULL;
char *cfg_role = NULL;
char *cfg_input = NULL;
+ char *cfg_edid_name = NULL;
int device_count;
int chosen_device;
int chosen_role;
@@ -223,7 +313,7 @@ bool unigraf_open_device(int drm_fd)
assert(igt_can_fail());

if (unigraf_device)
- return true;
+ return unigraf_connector_name != NULL;

unigraf_init();

@@ -250,6 +340,23 @@ bool unigraf_open_device(int drm_fd)
unigraf_debug("No input name configured.\n");
cfg_input = NULL;
}
+
+ cfg_error = NULL;
+ unigraf_connector_name = g_key_file_get_string(igt_key_file, UNIGRAF_CONFIG_GROUP,
+ UNIGRAF_CONFIG_CONNECTOR_NAME,
+ &cfg_error);
+ if (cfg_error) {
+ unigraf_debug("No connector name configured, will autodetect.\n");
+ unigraf_connector_name = NULL;
+ }
+
+ cfg_error = NULL;
+ cfg_edid_name = g_key_file_get_string(igt_key_file, UNIGRAF_CONFIG_GROUP,
+ UNIGRAF_CONFIG_EDID_NAME, &cfg_error);
+ if (cfg_error) {
+ unigraf_debug("No default EDID set, use IGT default.\n");
+ cfg_edid_name = NULL;
+ }
}

unigraf_assert(TSIX_DEV_RescanDevices(0, TSI_DEVCAP_VIDEO_CAPTURE, 0));
@@ -316,9 +423,21 @@ bool unigraf_open_device(int drm_fd)
unigraf_assert(TSIX_VIN_Select(unigraf_device, chosen_input));
unigraf_assert(TSIX_VIN_Enable(unigraf_device, chosen_input));

+ if (!cfg_edid_name)
+ cfg_edid_name = strdup("DEL_16543_DELL_P2314T_DP");
+
+ unigraf_default_edid = cfg_edid_name;
+
+ if (!unigraf_connector_name) {
+ unigraf_hpd_deassert();
+ unigraf_set_sst();
+ unigraf_hpd_assert();
+ unigraf_autodetect_connector(drm_fd);
+ }
+
unigraf_reset();

- return true;
+ return unigraf_connector_name != NULL;
}

/**
@@ -344,6 +463,8 @@ void unigraf_reset(void)
unigraf_plug();
unigraf_set_mst_stream_count(1);
unigraf_set_sst();
+ unigraf_load_default_edid();
+ unigraf_hpd_assert();
}

/**
diff --git a/lib/unigraf/unigraf.h b/lib/unigraf/unigraf.h
index 40f706ebd483..fdc4441740fa 100644
--- a/lib/unigraf/unigraf.h
+++ b/lib/unigraf/unigraf.h
@@ -11,6 +11,7 @@

#include <stdbool.h>
#include <stdint.h>
+#include <xf86drmMode.h>

/**
* unigraf_assert: Helper macro to assert a TSI return value and retrieve a detailed error message.
@@ -42,6 +43,8 @@ void unigraf_require_device(int drm_fd);

void unigraf_reset(void);

+drmModeConnectorPtr unigraf_get_connector(int drm_fd);
+
struct edid *unigraf_read_edid(uint32_t stream, uint32_t *edid_size);

void unigraf_write_edid(uint32_t stream, const struct edid *edid, uint32_t edid_size);

--
2.52.0