[PATCH i-g-t v2 28/39] lib/chamelium/v3: Plug specific ports for all tests

[Louis Chauvet]

As the chamelium v3 does not support plugging all ports at the same time,
something is required to identify which port must be plugged during
non-chamelium specific tests.

Add two options in port configuration:
- ConnectOnAnyTest: force this port to be plugged during any test
- EDID: Set a specific EDID for this port

Signed-off-by: Louis Chauvet <louis.chauvet at bootlin.com>
---
 lib/chamelium/v3/igt_chamelium.c | 19 ++++++++++++++
 lib/chamelium/v3/igt_chamelium.h |  7 +++++
 lib/igt_kms.c                    | 55 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/lib/chamelium/v3/igt_chamelium.c b/lib/chamelium/v3/igt_chamelium.c
index 51b3a610e358..736e593a465e 100644
--- a/lib/chamelium/v3/igt_chamelium.c
+++ b/lib/chamelium/v3/igt_chamelium.c
@@ -18,6 +18,8 @@
 #define CHAMELIUM_V3_CONFIG_MST_PATH "MstPath"
 #define CHAMELIUM_V3_CONFIG_PARENT_ID "ChameliumParentID"
 #define CHAMELIUM_V3_CONFIG_AUTODETECT_SAVE "ChameliumAutodetectSave"
+#define CHAMELIUM_V3_CONFIG_CONNECT_ON_ANY_TEST "ConnectOnAnyTest"
+#define CHAMELIUM_V3_CONFIG_EDID "EDID"
 
 struct igt_chamelium_v3 {
 	xmlrpc_env env;
@@ -234,6 +236,23 @@ static void chamelium_v3_fill_port_mapping_from_config_v3(struct igt_chamelium_v
 
 			port_mapping = chamelium_v3_port_mapping_alloc();
 			port_mapping->port_id = chamelium_port_id;
+			port_mapping->connect_on_any_test = g_key_file_get_boolean(igt_key_file,
+										   group_list[group_idx],
+										   CHAMELIUM_V3_CONFIG_CONNECT_ON_ANY_TEST,
+										   NULL);
+
+			if (g_key_file_has_key(igt_key_file, group_list[group_idx],
+					       CHAMELIUM_V3_CONFIG_EDID, NULL)) {
+				port_mapping->edid_name = g_key_file_get_string(igt_key_file,
+										group_list[group_idx],
+										CHAMELIUM_V3_CONFIG_EDID,
+										&error);
+				if (error) {
+					igt_info("Skipping malformed entry %s: %s\n",
+						 group_list[group_idx], error->message);
+					goto exit_loop;
+				}
+			}
 
 			if (g_key_file_has_key(igt_key_file, group_list[group_idx],
 					       CHAMELIUM_V3_CONFIG_PORT_NAME, NULL)) {
diff --git a/lib/chamelium/v3/igt_chamelium.h b/lib/chamelium/v3/igt_chamelium.h
index 90d2a7473894..834f446f4317 100644
--- a/lib/chamelium/v3/igt_chamelium.h
+++ b/lib/chamelium/v3/igt_chamelium.h
@@ -18,6 +18,9 @@ typedef int chamelium_edid_id;
  * the chamelium
  *
  * @port_id: Chamelium port ID.
+ * @connect_on_any_test: if true, this port will be connected, even for tests that are not
+ *                       chamelium-specific
+ * @edid_name: When using @connect_on_any_test, set this specific EDID to the port
  * @connector_name: DRM connector name, used to identify the connector in DRM, mutually exclusive
  *		    with @mst_path
  * @mst_path: MST path property, used to identify the connector in DRM, mutually exclusive with
@@ -29,6 +32,10 @@ typedef int chamelium_edid_id;
 struct chamelium_v3_port_mapping {
 	chamelium_v3_port_id port_id;
 
+	/* Using chamelium to emulate a display */
+	bool connect_on_any_test;
+	char *edid_name;
+
 	/* For normal DRM connector */
 	char *connector_name;
 
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 6c2b7cc4f5bd..a30bb483594c 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -49,6 +49,8 @@
 #include <time.h>
 
 #include <i915_drm.h>
+#include <chamelium/v3/igt_chamelium.h>
+#include <monitor_edids/monitor_edids_helper.h>
 
 #include "drmtest.h"
 #include "igt_kms.h"
@@ -2883,14 +2885,7 @@ void igt_display_require(igt_display_t *display, int drm_fd)
 	if (!resources)
 		goto out;
 
-/*
- * FIXME: Dirty hack to avoid those lines when chamelium v3 is used
- *
- * Must be replaced with a configuration file information, so the end user can choose if the
- * chamelium must be connected or not.
- */
 #ifdef HAVE_CHAMELIUM_V2
-#ifndef HAVE_CHAMELIUM_V3
 	{
 		struct chamelium *chamelium;
 
@@ -2906,6 +2901,52 @@ void igt_display_require(igt_display_t *display, int drm_fd)
 		}
 	}
 #endif
+
+#ifdef HAVE_CHAMELIUM_V3
+	{
+		struct igt_chamelium_v3 *chamelium = chamelium_v3_init_from_config();
+
+		if (chamelium) {
+			struct chamelium_v3_port_mapping *mapping, *tmp;
+
+			chamelium_v3_reset(chamelium);
+			chamelium_v3_fill_port_mapping(chamelium);
+
+			igt_list_for_each_entry_safe(mapping, tmp,
+						     chamelium_v3_get_port_mapping(chamelium),
+						     link) {
+				if (mapping->connect_on_any_test && !chamelium_v3_is_mst(chamelium, mapping->port_id)) {
+					int edid_id = CHAMELIUM_DEFAULT_EDID;
+
+					igt_info("Plugging port %s\n", mapping->connector_name);
+					if (mapping->edid_name) {
+						struct edid *edid = get_edid_by_name(mapping->edid_name);
+
+						if (edid)
+							edid_id = chamelium_v3_create_edid(chamelium,
+											   edid);
+						else
+							igt_warn("Impossible to find an edid named \"%s\". Available names:\n",
+								 mapping->edid_name);
+							list_edid_names(IGT_LOG_WARN);
+					}
+					if (edid_id == CHAMELIUM_DEFAULT_EDID)
+						igt_info("\tUsing default EDID\n");
+					else
+						igt_info("\tUsing edid: %s\n", mapping->edid_name);
+
+					chamelium_v3_apply_edid(chamelium, mapping->port_id,
+								edid_id);
+					chamelium_v3_plug(chamelium, mapping->port_id);
+					igt_require(igt_wait_for_connector_status(drm_fd,
+										  chamelium_v3_port_mapping_get_connector_id(mapping, drm_fd),
+										  igt_default_detect_timeout(),
+										  DRM_MODE_CONNECTED));
+				}
+			}
+			chamelium_v3_uninit(chamelium);
+		}
+	}
 #endif
 
 	igt_require_f(resources->count_crtcs <= IGT_MAX_PIPES,

-- 
2.44.2