[PATCH i-g-t 2/4] tests/intel/kms_mst_helper: add helper for mst related functions

[Kunal Joshi]

add helper for mst related functions

Signed-off-by: Kunal Joshi <kunal1.joshi at intel.com>
---
 tests/intel/kms_dp_linktrain_fallback.c | 27 +++----------------------
 tests/intel/kms_mst_helper.c            | 27 +++++++++++++++++++++++++
 tests/intel/kms_mst_helper.h            | 11 ++++++++++
 tests/meson.build                       |  2 ++
 4 files changed, 43 insertions(+), 24 deletions(-)
 create mode 100644 tests/intel/kms_mst_helper.c
 create mode 100644 tests/intel/kms_mst_helper.h

diff --git a/tests/intel/kms_dp_linktrain_fallback.c b/tests/intel/kms_dp_linktrain_fallback.c
index a05e2015f..13b9d3ee8 100644
--- a/tests/intel/kms_dp_linktrain_fallback.c
+++ b/tests/intel/kms_dp_linktrain_fallback.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 
 #include "igt.h"
+#include "intel/kms_mst_helper.h"
 
 /**
  * SUBTEST: dp-fallback
@@ -47,28 +48,6 @@ typedef int (*condition_check_fn)(int drm_fd, igt_output_t *output);
 
 IGT_TEST_DESCRIPTION("Test link training fallback");
 
-static void find_mst_outputs(int drm_fd, data_t *data,
-			     igt_output_t *output,
-			     igt_output_t *mst_outputs[],
-			     int *num_mst_outputs)
-{
-	int output_root_id, root_id;
-	igt_output_t *connector_output;
-
-	output_root_id = igt_get_dp_mst_connector_id(output);
-	/*
-	 * If output is MST check all other connected output which shares
-	 * same path and fill mst_outputs and num_mst_outputs
-	 */
-	for_each_connected_output(&data->display, connector_output) {
-		if (!igt_check_output_is_dp_mst(connector_output))
-			continue;
-		root_id = igt_get_dp_mst_connector_id(connector_output);
-		if (((*num_mst_outputs) < IGT_MAX_PIPES) && root_id == output_root_id)
-			mst_outputs[(*num_mst_outputs)++] = connector_output;
-	}
-}
-
 static bool setup_mst_outputs(data_t *data, igt_output_t *mst_output[],
 			      int *output_count)
 {
@@ -83,8 +62,8 @@ static bool setup_mst_outputs(data_t *data, igt_output_t *mst_output[],
 		    traversed_mst_outputs[i] == data->output->config.connector->connector_id)
 			return false;
 
-	find_mst_outputs(data->drm_fd, data, data->output,
-			 mst_output, output_count);
+	igt_assert_f(igt_find_all_mst_output_in_topology(data->drm_fd, &data->display, data->output,
+			 mst_output, output_count), "Unable to find mst outputs\n");
 
 	for (i = 0; i < *output_count; i++) {
 		output = mst_output[i];
diff --git a/tests/intel/kms_mst_helper.c b/tests/intel/kms_mst_helper.c
new file mode 100644
index 000000000..ec688c989
--- /dev/null
+++ b/tests/intel/kms_mst_helper.c
@@ -0,0 +1,27 @@
+#include "kms_mst_helper.h"
+
+bool igt_find_all_mst_output_in_topology(int drm_fd, igt_display_t *display,
+		      igt_output_t *output,
+		      igt_output_t *mst_outputs[],
+		      int *num_mst_outputs)
+{
+    int output_root_id, root_id;
+    igt_output_t *connector_output;
+
+    if (!igt_check_output_is_dp_mst(output))
+	return false;
+
+    output_root_id = igt_get_dp_mst_connector_id(output);
+    /*
+     * If output is MST check all other connected output which shares
+     * same path and fill mst_outputs and num_mst_outputs
+     */
+    for_each_connected_output(display, connector_output) {
+	if (!igt_check_output_is_dp_mst(connector_output))
+	continue;
+	root_id = igt_get_dp_mst_connector_id(connector_output);
+	if (((*num_mst_outputs) < IGT_MAX_PIPES) && root_id == output_root_id)
+	    mst_outputs[(*num_mst_outputs)++] = connector_output;
+    }
+    return true;
+}
diff --git a/tests/intel/kms_mst_helper.h b/tests/intel/kms_mst_helper.h
new file mode 100644
index 000000000..0c1158e72
--- /dev/null
+++ b/tests/intel/kms_mst_helper.h
@@ -0,0 +1,11 @@
+#ifndef KMS_MST_HELPER_H
+#define KMS_MST_HELPER_H
+
+#include "igt.h"
+
+bool igt_find_all_mst_output_in_topology(int drm_fd, igt_display_t *display,
+		      igt_output_t *output,
+		      igt_output_t *mst_outputs[],
+		      int *num_mst_outputs);
+
+#endif // KMS_MST_HELPER_H
diff --git a/tests/meson.build b/tests/meson.build
index 8dd5e34a1..e2a0acfcd 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -368,6 +368,8 @@ extra_sources = {
 	'kms_dsc': [ join_paths ('intel', 'kms_dsc_helper.c') ],
 	'kms_psr2_sf':  [ join_paths ('intel', 'kms_dsc_helper.c') ],
 	'kms_joiner': [join_paths ('intel', 'kms_joiner_helper.c')],
+	'kms_feature_discovery': [join_paths ('intel', 'kms_joiner_helper.c')],
+	'kms_dp_linktrain_fallback': [join_paths ('intel', 'kms_mst_helper.c')],
 }
 
 # Extra dependencies used on core and Intel drivers
-- 
2.34.1