From: Louis Chauvet <louis.chauvet@bootlin.com>
To: igt-dev@lists.freedesktop.org
Cc: thomas.petazzoni@bootlin.com, luca.ceresoli@bootlin.com,
kory.maincent@bootlin.com, markyacoub@google.com,
khaled.almahallawy@intel.com,
Louis Chauvet <louis.chauvet@bootlin.com>
Subject: [PATCH i-g-t v10 22/49] lib/unigraf: Introduce device configuration
Date: Tue, 31 Mar 2026 19:11:39 +0200 [thread overview]
Message-ID: <20260331-unigraf-integration-v10-22-12266c34cc1d@bootlin.com> (raw)
In-Reply-To: <20260331-unigraf-integration-v10-0-12266c34cc1d@bootlin.com>
As there could be multiple devices detected by libTSI, add a configuration
field to ensure that igt will use the proper unigraf device.
The unigraf integration will search for a [Unigraf] entry containing a
Device=
For example, it can look like:
[Unigraf]
Device=UCD-500 [2434C620]
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
lib/vendor/unigraf/unigraf.c | 50 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/lib/vendor/unigraf/unigraf.c b/lib/vendor/unigraf/unigraf.c
index 81ffae7a8ac3..bf52357e1dc9 100644
--- a/lib/vendor/unigraf/unigraf.c
+++ b/lib/vendor/unigraf/unigraf.c
@@ -13,6 +13,7 @@
#include "unigraf.h"
#include "TSI.h"
#include "TSI_types.h"
+#include "igt_rc.h"
#define unigraf_debug(fmt, ...) igt_debug("TSI:%p: " fmt, unigraf_device, ##__VA_ARGS__)
@@ -20,6 +21,21 @@ static TSI_HANDLE unigraf_device;
static char *unigraf_default_edid;
static char *unigraf_connector_name;
+/**
+ * UNIGRAF_NAME_MAX - Maximum name length to be used for TSI functions
+ */
+#define UNIGRAF_NAME_MAX 1024
+
+/**
+ * UNIGRAF_CONFIG_GROUP - Name of the unigraf group in the configuration file
+ */
+#define UNIGRAF_CONFIG_GROUP "Unigraf"
+
+/**
+ * UNIGRAF_CONFIG_DEVICE_NAME - Key of the device name in the configuration file
+ */
+#define UNIGRAF_CONFIG_DEVICE_NAME "Device"
+
static void unigraf_close_device(void)
{
if (!unigraf_device)
@@ -66,6 +82,21 @@ static unsigned int unigraf_device_count(void)
return unigraf_assert(TSIX_DEV_GetDeviceCount());
}
+static int unigraf_find_device(char *request)
+{
+ int device_count = unigraf_device_count();
+
+ for (int i = 0; i < device_count; i++) {
+ char dev_name[UNIGRAF_NAME_MAX] = "";
+
+ unigraf_assert(TSIX_DEV_GetDeviceName(i, dev_name, UNIGRAF_NAME_MAX));
+ unigraf_debug("Detected unigraf device %d: %s\n", i, dev_name);
+ if (!strncmp(dev_name, request, UNIGRAF_NAME_MAX))
+ return i;
+ }
+ return -ENODEV;
+}
+
/**
* unigraf_open_device() - Search and open a device.
* @drm_fd: File descriptor of the currently used drm device
@@ -80,6 +111,8 @@ static unsigned int unigraf_device_count(void)
bool unigraf_open_device(int drm_fd)
{
TSI_RESULT r;
+ GError *cfg_error = NULL;
+ char *cfg_device = NULL;
int device_count;
int chosen_device = 0;
int chosen_role = 0;
@@ -92,6 +125,15 @@ bool unigraf_open_device(int drm_fd)
unigraf_init();
+ if (igt_key_file) {
+ cfg_device = g_key_file_get_string(igt_key_file, UNIGRAF_CONFIG_GROUP,
+ UNIGRAF_CONFIG_DEVICE_NAME, &cfg_error);
+ if (cfg_error) {
+ unigraf_debug("No device name configured, uses first device available.\n");
+ cfg_device = NULL;
+ }
+ }
+
unigraf_assert(TSIX_DEV_RescanDevices(0, TSI_DEVCAP_VIDEO_CAPTURE, 0));
device_count = unigraf_device_count();
@@ -100,6 +142,14 @@ bool unigraf_open_device(int drm_fd)
return false;
}
+ if (cfg_device) {
+ chosen_device = unigraf_find_device(cfg_device);
+ if (chosen_device < 0) {
+ igt_warn("The requested unigraf device %s is not found, err: %d.\n", cfg_device, chosen_device);
+ return false;
+ }
+ }
+
unigraf_device = TSIX_DEV_OpenDevice(chosen_device, &r);
unigraf_assert(r);
igt_assert(unigraf_device);
--
2.52.0
next prev parent reply other threads:[~2026-03-31 17:11 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-31 17:11 [PATCH i-g-t v10 00/49] Unigraf integration Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 01/49] lib/igt_kms: Add a detect timeout value Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 02/49] lib/igt_kms: Add helper to wait for a specific status on a connector Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 03/49] lib/igt_kms: Add function to list connected connectors Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 04/49] lib/igt_kms: Add helper to obtain a connector by its name or MST path Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 05/49] lib/igt_kms: Add helper to wait for new connectors Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 06/49] lib/tests: Add tests for array manipulations Louis Chauvet
2026-04-20 16:08 ` Kory Maincent
2026-03-31 17:11 ` [PATCH i-g-t v10 07/49] lib/igt_kms: Add helper to get a pipe from a connector Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 08/49] lib/igt_kms: Expose dump_connector_attrs Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 09/49] lib/igt_kms: Expose reset_connectors_at_exit Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 10/49] lib/igt_kms: Expose connector_attr_set and igt_connector_attr_set Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 11/49] lib/igt_debugfs: Move debugfs helpers to the proper location Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 12/49] lib/igt_debugfs: Add const when make sense Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 13/49] lib/igt_amd: " Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 14/49] lib/igt_kms: " Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 15/49] lib/monitor_edids: Add helper functions for using monitor_edid objects Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 16/49] lib/monitor_edids: Add helper to get an EDID by its name Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 17/49] lib/monitor_edids: Add helper to print all available EDID names Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 18/49] lib/unigraf: Add used defines for TSI_Types Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 19/49] lib/unigraf: Add TSI.h Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 20/49] lib/unigraf: Initial Unigraf support Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 21/49] lib/igt_kms: Automatically connect unigraf on display require Louis Chauvet
2026-03-31 17:11 ` Louis Chauvet [this message]
2026-04-20 16:10 ` [PATCH i-g-t v10 22/49] lib/unigraf: Introduce device configuration Kory Maincent
2026-03-31 17:11 ` [PATCH i-g-t v10 23/49] lib/unigraf: Introduce role configuration Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 24/49] lib/unigraf: Introduce input configuration Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 25/49] lib/unigraf: Add reset function Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 26/49] lib/unigraf: Add unigraf assert and deassert helpers Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 27/49] lib/unigraf: Add plug/unplug helpers Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 28/49] lib/unigraf: Allows sst/mst configuration Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 29/49] lib/unigraf: Add helpers to read and write edid Louis Chauvet
2026-04-20 16:29 ` Kory Maincent
2026-03-31 17:11 ` [PATCH i-g-t v10 30/49] lib/unigraf: Add connector and EDID configuration Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 31/49] tests/unigraf: Add basic unigraf tests Louis Chauvet
2026-04-20 16:49 ` Kory Maincent
2026-04-23 5:45 ` Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 32/49] lib/unigraf: Add unigraf CRC capture Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 33/49] lib/unigraf: Add configuration for CRC usage Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 34/49] lib/unigraf: add unigraf_get_connector_by_stream Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 35/49] lib/unigraf: Add helper to check timings received by unigraf Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 36/49] lib/igt_pipe_crc: Add unigraf crc calculation Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 37/49] lib/i915/dp: Move DP-related function for i915 to proper folder Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 38/49] lib/i915/dp: Rename functions to avoid confusion Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 39/49] lib/i915/dp: Add helper to get maximum supported rate Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 40/49] lib/i915/dp: Properly check sscanf results Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 41/49] lib/i915/dp: Use igt_output_name instead of private field Louis Chauvet
2026-03-31 17:11 ` [PATCH i-g-t v10 42/49] lib/igt_dp: Create generic helpers for DP information Louis Chauvet
2026-04-24 15:49 ` Kory Maincent
2026-03-31 17:12 ` [PATCH i-g-t v10 43/49] lib/igt_kms: Add asserts to avoid null pointer dereference Louis Chauvet
2026-03-31 17:12 ` [PATCH i-g-t v10 44/49] lib/igt_kms: Add helper to get a CRTC from an output Louis Chauvet
2026-04-20 16:07 ` Kory Maincent
2026-03-31 17:12 ` [PATCH i-g-t v10 45/49] lib/unigraf: Add lane count configuration Louis Chauvet
2026-03-31 17:12 ` [PATCH i-g-t v10 46/49] docs/unigraf: Add unigraf documentation Louis Chauvet
2026-04-20 16:06 ` Kory Maincent
2026-03-31 17:12 ` [PATCH i-g-t v10 47/49] lib/unigraf: Add helpers to set maximum link rate Louis Chauvet
2026-03-31 17:12 ` [PATCH i-g-t v10 48/49] lib/unigraf: Add helpers to get the current LT status Louis Chauvet
2026-03-31 17:12 ` [PATCH i-g-t v10 49/49] tests/unigraf/unigraf_lt: Add test for link training Louis Chauvet
2026-03-31 17:49 ` ✓ Xe.CI.BAT: success for Unigraf integration (rev9) Patchwork
2026-03-31 18:17 ` ✗ i915.CI.BAT: failure " Patchwork
2026-03-31 23:45 ` ✓ Xe.CI.FULL: success " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260331-unigraf-integration-v10-22-12266c34cc1d@bootlin.com \
--to=louis.chauvet@bootlin.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=khaled.almahallawy@intel.com \
--cc=kory.maincent@bootlin.com \
--cc=luca.ceresoli@bootlin.com \
--cc=markyacoub@google.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox