[PATCH i-g-t v2 23/26] tests/unigraf: Add basic unigraf tests

[Louis Chauvet]

Adds two tests to validate unigraf communication.

unigraf-connected checks if the device is connected and if the EDID is
properly applied.

ungiraf-disconnect checks if the device can be connected/reconnected using
SST and MST configurations.
---
 lib/igt_kms.c                        |   9 +--
 tests/meson.build                    |   4 ++
 tests/unigraf/meson.build            |  12 ++++
 tests/unigraf/unigraf_connectivity.c | 126 +++++++++++++++++++++++++++++++++++
 4 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 95ad7885a7dc284031e2f0fda2b0655474f295d2..8d8d4da593e60a1072305c4a04a4d430798a3379 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -65,6 +65,9 @@
 #ifdef HAVE_CHAMELIUM
 #include "igt_chamelium.h"
 #endif
+#ifdef HAVE_UNIGRAF
+#include "unigraf/unigraf.h"
+#endif
 
 /**
  * SECTION:igt_kms
@@ -2926,12 +2929,6 @@ void igt_display_require(igt_display_t *display, int drm_fd)
 	int i;
 	bool is_intel_dev;
 
-#ifdef HAVE_UNIGRAF
-	if (unigraf_open_device()) {
-		sleep(1);
-	}
-#endif
-
 	memset(display, 0, sizeof(igt_display_t));
 
 	LOG_INDENT(display, "init");
diff --git a/tests/meson.build b/tests/meson.build
index 55bcf57ec58b2903fcf77e629901f9ed450981da..87dd3cc6dff62b73273e90122db0bbc14cdadb4c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -454,6 +454,10 @@ foreach prog : intel_progs
 	endif
 endforeach
 
+if libtsi.found()
+	subdir('unigraf')
+endif
+
 if chamelium.found()
 	foreach prog : chamelium_progs
 		testexe = executable(prog,
diff --git a/tests/unigraf/meson.build b/tests/unigraf/meson.build
new file mode 100644
index 0000000000000000000000000000000000000000..4ef8c32151e4368cf20d1b2b6bbf4228240fa3ef
--- /dev/null
+++ b/tests/unigraf/meson.build
@@ -0,0 +1,12 @@
+unigraf_progs = [
+	'unigraf_connectivity',
+]
+
+foreach prog : unigraf_progs
+	test_executables += executable(prog, prog + '.c',
+				       dependencies : test_deps,
+				       install_dir : unigrafdir,
+				       install_rpath : unigraf_rpathdir,
+				       install : true)
+	test_list += join_paths('unigraf', prog)
+endforeach
diff --git a/tests/unigraf/unigraf_connectivity.c b/tests/unigraf/unigraf_connectivity.c
new file mode 100644
index 0000000000000000000000000000000000000000..68fb52cccf6ccb7921a64c0dc6f1652318aed957
--- /dev/null
+++ b/tests/unigraf/unigraf_connectivity.c
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: MIT
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <xf86drmMode.h>
+
+#include "drmtest.h"
+#include "igt_aux.h"
+#include "igt_core.h"
+#include "igt_kms.h"
+#include "unigraf/unigraf.h"
+
+/**
+ * TEST: unigraf connectivity
+ * Category: Core
+ * Description: Testing connectivity with a unigraf device
+ *
+ * SUBTEST: unigraf-open
+ * Description: Make sure that a unigraf device can be accessed
+ *
+ * SUBTEST: unigraf-connected
+ * Description: Make sure that the unigraf device is connected to the DUT
+ */
+
+IGT_TEST_DESCRIPTION("Test basic unigraf connectivity");
+igt_main
+{
+	int drm_fd;
+
+	igt_fixture {
+		drm_fd = drm_open_driver_master(DRIVER_ANY);
+	}
+
+	igt_describe("Make sure that the unigraf device is connected to the DUT");
+	igt_subtest("unigraf-connected") {
+		drmModePropertyBlobPtr edid_blob = NULL;
+		struct igt_display display;
+		uint64_t edid_blob_id;
+		igt_output_t *output;
+		uint32_t unigraf_edid_len;
+		void *unigraf_edid;
+		bool found;
+
+		unigraf_require_device();
+		unigraf_hpd_deassert();
+		sleep(1);
+		unigraf_set_sst();
+		unigraf_hpd_assert();
+
+		sleep(5);
+
+		igt_display_require(&display, drm_fd);
+		sleep(5);
+
+		unigraf_edid = unigraf_read_edid(0, &unigraf_edid_len);
+
+		for_each_connected_output(&display, output) {
+			igt_info("%s:%d:%s: %s\n", __FILE_NAME__, __LINE__, __FUNCTION__, output->name);
+			if (output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
+				igt_assert(kmstest_get_property(drm_fd, output->config.connector->connector_id,
+								DRM_MODE_OBJECT_CONNECTOR, "EDID", NULL,
+								&edid_blob_id, NULL));
+				edid_blob = drmModeGetPropertyBlob(drm_fd, edid_blob_id);
+				if (!edid_blob)
+					continue;
+
+				found |= memcmp(unigraf_edid, edid_blob->data, min(edid_blob->length, unigraf_edid_len)) == 0;
+
+				drmModeFreePropertyBlob(edid_blob);
+			}
+			igt_info("%s:%d:%s\n", __FILE_NAME__, __LINE__, __FUNCTION__);
+		}
+		igt_assert_f(found, "No output with the correct EDID was found\n");
+
+		free(unigraf_edid);
+	}
+
+	igt_describe("Make sure that the unigraf device can be deconnected/reconnected");
+	igt_subtest("ungiraf-disconnect") {
+		unigraf_require_device();
+		int newly_connected_count, already_connected_count, diff_len;
+		uint32_t *newly_connected = NULL, *already_connected = NULL, *diff = NULL;
+
+		int max_count = unigraf_get_mst_stream_max_count();
+
+		unigraf_hpd_deassert();
+
+		already_connected_count = igt_get_connected_connectors(drm_fd, &already_connected);
+
+		igt_debug("Already connected count: %d\n", already_connected_count);
+
+		// i = 0 is SST
+		for(int i = 0; i <= max_count; i++) {
+			// system("echo '89' && (modetest -c | grep connected)");
+			unigraf_hpd_deassert();
+
+			sleep(1);
+
+			unigraf_set_mst_stream_count(max(i, 1));
+			if (i == 0)
+				unigraf_set_sst();
+			else
+				unigraf_set_mst();
+
+			unigraf_hpd_assert();
+
+			/*
+			 * 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(5);
+
+			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);
+
+			igt_assert_f(diff_len == max(i, 1), "Invalid connected connector count, expected %d found %d\n", max(i, 1), diff_len);
+		}
+	}
+}

-- 
2.50.0