[PATCH i-g-t v7 2/3] tests/chamelium/kms_chamelium: use helper function for connector lookup in DP/HDMI/VGA tests

[Mohammed Bilal <mohammed.bilal@intel.com>]

Use the connector_test() helper macro for chamelium hpd, audio, edid, and
frames tests to iterate over and test all matching connected ports. This
ensures clean skipping and consistent connector handling across DP/HDMI/VGA
tests, and avoids unintended execution of unrelated fixtures.

Signed-off-by: Mohammed Bilal <mohammed.bilal@intel.com>
---
 tests/chamelium/kms_chamelium_audio.c  |  42 ++---
 tests/chamelium/kms_chamelium_edid.c   | 183 +++++++------------
 tests/chamelium/kms_chamelium_frames.c | 111 ++++--------
 tests/chamelium/kms_chamelium_hpd.c    | 239 ++++++++++---------------
 4 files changed, 216 insertions(+), 359 deletions(-)

diff --git a/tests/chamelium/kms_chamelium_audio.c b/tests/chamelium/kms_chamelium_audio.c
index c89f644ff..030a01051 100644
--- a/tests/chamelium/kms_chamelium_audio.c
+++ b/tests/chamelium/kms_chamelium_audio.c
@@ -851,48 +851,30 @@ IGT_TEST_DESCRIPTION("Testing Audio with a Chamelium board");
 int igt_main()
 {
 	chamelium_data_t data;
-	struct chamelium_port *port;
-	int p;
 
 	igt_fixture() {
 		chamelium_init_test(&data);
 	}
 
 	igt_describe("DisplayPort tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_DisplayPort,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_display_audio_desc);
-		connector_subtest("dp-audio", DisplayPort) test_display_audio(
-			&data, port, "HDMI", IGT_CUSTOM_EDID_DP_AUDIO);
+	igt_describe(test_display_audio_desc);
+	connector_test("dp-audio", DisplayPort, &data, test_display_audio,
+		       "HDMI", IGT_CUSTOM_EDID_DP_AUDIO);
 
-		igt_describe(test_display_audio_edid_desc);
-		connector_subtest("dp-audio-edid", DisplayPort)
-			test_display_audio_edid(&data, port,
-						IGT_CUSTOM_EDID_DP_AUDIO);
-	}
+	igt_describe(test_display_audio_edid_desc);
+	connector_test("dp-audio-edid", DisplayPort, &data, test_display_audio_edid,
+		       IGT_CUSTOM_EDID_DP_AUDIO);
 
 	igt_describe("HDMI tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_HDMIA,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_display_audio_desc);
-		connector_subtest("hdmi-audio", HDMIA) test_display_audio(
-			&data, port, "HDMI", IGT_CUSTOM_EDID_HDMI_AUDIO);
+	igt_describe(test_display_audio_desc);
+	connector_test("hdmi-audio", HDMIA, &data, test_display_audio,
+		       "HDMI", IGT_CUSTOM_EDID_HDMI_AUDIO);
 
-		igt_describe(test_display_audio_edid_desc);
-		connector_subtest("hdmi-audio-edid", HDMIA)
-			test_display_audio_edid(&data, port,
-						IGT_CUSTOM_EDID_HDMI_AUDIO);
-	}
+	igt_describe(test_display_audio_edid_desc);
+	connector_test("hdmi-audio-edid", HDMIA, &data, test_display_audio_edid,
+		       IGT_CUSTOM_EDID_HDMI_AUDIO);
 
 	igt_fixture() {
 		igt_display_fini(&data.display);
diff --git a/tests/chamelium/kms_chamelium_edid.c b/tests/chamelium/kms_chamelium_edid.c
index 5b1a063ff..4b156dbcb 100644
--- a/tests/chamelium/kms_chamelium_edid.c
+++ b/tests/chamelium/kms_chamelium_edid.c
@@ -249,6 +249,15 @@ static void igt_custom_edid_type_read(chamelium_data_t *data,
 	drmModeFreeConnector(connector);
 }
 
+static void edid_read_base_and_alt(chamelium_data_t *data,
+				    struct chamelium_port *port,
+				    enum igt_custom_edid_type edid_base,
+				    enum igt_custom_edid_type edid_alt)
+{
+	igt_custom_edid_type_read(data, port, edid_base);
+	igt_custom_edid_type_read(data, port, edid_alt);
+}
+
 static const char igt_edid_stress_resolution_desc[] =
 	"Stress test the DUT by testing multiple EDIDs, one right after the other, "
 	"and ensure their validity by check the real screen resolution vs the "
@@ -523,132 +532,74 @@ IGT_TEST_DESCRIPTION("Testing EDID with a Chamelium board");
 int igt_main_args("e", NULL, help_str, opt_handler, NULL)
 {
 	chamelium_data_t data;
-	struct chamelium_port *port;
-	int p;
 
 	igt_fixture() {
 		chamelium_init_test(&data);
 	}
 
 	igt_describe("DisplayPort tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_DisplayPort,
-				data.port_count, 1);
-		}
-
-		igt_describe(igt_custom_edid_type_read_desc);
-		connector_subtest("dp-edid-read", DisplayPort)
-		{
-			igt_custom_edid_type_read(&data, port,
-						  IGT_CUSTOM_EDID_BASE);
-			igt_custom_edid_type_read(&data, port,
-						  IGT_CUSTOM_EDID_ALT);
-		}
-
-		igt_describe(igt_edid_stress_resolution_desc);
-		connector_subtest("dp-edid-stress-resolution-4k", DisplayPort)
-			edid_stress_resolution(&data, port, DP_EDIDS_4K,
-					       ARRAY_SIZE(DP_EDIDS_4K), false);
-
-		igt_describe(igt_edid_stress_resolution_desc);
-		connector_subtest("dp-edid-stress-resolution-non-4k",
-				  DisplayPort)
-			edid_stress_resolution(&data, port, DP_EDIDS_NON_4K,
-					       ARRAY_SIZE(DP_EDIDS_NON_4K), false);
-
-		igt_describe(igt_edid_resolution_list_desc);
-		connector_subtest("dp-edid-resolution-list", DisplayPort)
-			edid_resolution_list(&data, port);
-
-		igt_describe(test_suspend_resume_edid_change_desc);
-		connector_subtest("dp-edid-change-during-suspend", DisplayPort)
-			test_suspend_resume_edid_change(&data, port,
-							SUSPEND_STATE_MEM,
-							SUSPEND_TEST_NONE,
-							IGT_CUSTOM_EDID_BASE,
-							IGT_CUSTOM_EDID_ALT);
-
-		igt_describe(test_suspend_resume_edid_change_desc);
-		connector_subtest("dp-edid-change-during-hibernate",
-				  DisplayPort)
-			test_suspend_resume_edid_change(&data, port,
-							SUSPEND_STATE_DISK,
-							SUSPEND_TEST_DEVICES,
-							IGT_CUSTOM_EDID_BASE,
-							IGT_CUSTOM_EDID_ALT);
-
-		igt_describe(test_mode_timings_desc);
-		connector_subtest("dp-mode-timings", DisplayPort)
-			test_mode_timings(&data, port);
-	}
+
+	igt_describe(igt_custom_edid_type_read_desc);
+	connector_test("dp-edid-read", DisplayPort, &data, edid_read_base_and_alt,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
+
+	igt_describe(igt_edid_stress_resolution_desc);
+	connector_test("dp-edid-stress-resolution-4k", DisplayPort, &data,
+		       edid_stress_resolution, DP_EDIDS_4K, ARRAY_SIZE(DP_EDIDS_4K), false);
+
+	igt_describe(igt_edid_stress_resolution_desc);
+	connector_test("dp-edid-stress-resolution-non-4k", DisplayPort, &data,
+		       edid_stress_resolution, DP_EDIDS_NON_4K, ARRAY_SIZE(DP_EDIDS_NON_4K), false);
+
+	igt_describe(igt_edid_resolution_list_desc);
+	connector_test("dp-edid-resolution-list", DisplayPort, &data, edid_resolution_list);
+
+	igt_describe(test_suspend_resume_edid_change_desc);
+	connector_test("dp-edid-change-during-suspend", DisplayPort, &data,
+		       test_suspend_resume_edid_change, SUSPEND_STATE_MEM, SUSPEND_TEST_NONE,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
+
+	igt_describe(test_suspend_resume_edid_change_desc);
+	connector_test("dp-edid-change-during-hibernate", DisplayPort, &data,
+		       test_suspend_resume_edid_change, SUSPEND_STATE_DISK, SUSPEND_TEST_DEVICES,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
+
+	igt_describe(test_mode_timings_desc);
+	connector_test("dp-mode-timings", DisplayPort, &data, test_mode_timings);
 
 	igt_describe("HDMI tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_HDMIA,
-				data.port_count, 1);
-		}
-
-		igt_describe(igt_custom_edid_type_read_desc);
-		connector_subtest("hdmi-edid-read", HDMIA)
-		{
-			igt_custom_edid_type_read(&data, port,
-						  IGT_CUSTOM_EDID_BASE);
-			igt_custom_edid_type_read(&data, port,
-						  IGT_CUSTOM_EDID_ALT);
-		}
-
-		igt_describe(igt_edid_stress_resolution_desc);
-		connector_subtest("hdmi-edid-stress-resolution-4k", HDMIA)
-			edid_stress_resolution(&data, port, HDMI_EDIDS_4K,
-					       ARRAY_SIZE(HDMI_EDIDS_4K), false);
-
-		igt_describe(igt_edid_stress_resolution_desc);
-		connector_subtest("hdmi-edid-stress-resolution-non-4k", HDMIA)
-			edid_stress_resolution(&data, port, HDMI_EDIDS_NON_4K,
-					       ARRAY_SIZE(HDMI_EDIDS_NON_4K), true);
-
-		igt_describe(test_suspend_resume_edid_change_desc);
-		connector_subtest("hdmi-edid-change-during-suspend", HDMIA)
-			test_suspend_resume_edid_change(&data, port,
-							SUSPEND_STATE_MEM,
-							SUSPEND_TEST_NONE,
-							IGT_CUSTOM_EDID_BASE,
-							IGT_CUSTOM_EDID_ALT);
-
-		igt_describe(test_suspend_resume_edid_change_desc);
-		connector_subtest("hdmi-edid-change-during-hibernate", HDMIA)
-			test_suspend_resume_edid_change(&data, port,
-							SUSPEND_STATE_DISK,
-							SUSPEND_TEST_DEVICES,
-							IGT_CUSTOM_EDID_BASE,
-							IGT_CUSTOM_EDID_ALT);
-
-		igt_describe(test_mode_timings_desc);
-		connector_subtest("hdmi-mode-timings", HDMIA)
-			test_mode_timings(&data, port);
-	}
+
+	igt_describe(igt_custom_edid_type_read_desc);
+	connector_test("hdmi-edid-read", HDMIA, &data, edid_read_base_and_alt,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
+
+	igt_describe(igt_edid_stress_resolution_desc);
+	connector_test("hdmi-edid-stress-resolution-4k", HDMIA, &data,
+		       edid_stress_resolution, HDMI_EDIDS_4K, ARRAY_SIZE(HDMI_EDIDS_4K), false);
+
+	igt_describe(igt_edid_stress_resolution_desc);
+	connector_test("hdmi-edid-stress-resolution-non-4k", HDMIA, &data,
+		       edid_stress_resolution, HDMI_EDIDS_NON_4K,
+		       ARRAY_SIZE(HDMI_EDIDS_NON_4K), true);
+
+	igt_describe(test_suspend_resume_edid_change_desc);
+	connector_test("hdmi-edid-change-during-suspend", HDMIA, &data,
+		       test_suspend_resume_edid_change, SUSPEND_STATE_MEM, SUSPEND_TEST_NONE,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
+
+	igt_describe(test_suspend_resume_edid_change_desc);
+	connector_test("hdmi-edid-change-during-hibernate", HDMIA, &data,
+		       test_suspend_resume_edid_change, SUSPEND_STATE_DISK, SUSPEND_TEST_DEVICES,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
+
+	igt_describe(test_mode_timings_desc);
+	connector_test("hdmi-mode-timings", HDMIA, &data, test_mode_timings);
 
 	igt_describe("VGA tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_VGA,
-				data.port_count, 1);
-		}
-
-		igt_describe(igt_custom_edid_type_read_desc);
-		connector_subtest("vga-edid-read", VGA)
-		{
-			igt_custom_edid_type_read(&data, port,
-						  IGT_CUSTOM_EDID_BASE);
-			igt_custom_edid_type_read(&data, port,
-						  IGT_CUSTOM_EDID_ALT);
-		}
-	}
+
+	igt_describe(igt_custom_edid_type_read_desc);
+	connector_test("vga-edid-read", VGA, &data, edid_read_base_and_alt,
+		       IGT_CUSTOM_EDID_BASE, IGT_CUSTOM_EDID_ALT);
 
 	igt_fixture() {
 		igt_display_fini(&data.display);
diff --git a/tests/chamelium/kms_chamelium_frames.c b/tests/chamelium/kms_chamelium_frames.c
index 29f957385..782275590 100644
--- a/tests/chamelium/kms_chamelium_frames.c
+++ b/tests/chamelium/kms_chamelium_frames.c
@@ -995,59 +995,39 @@ int igt_main()
 	}
 
 	igt_describe("DisplayPort tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_DisplayPort,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_display_all_modes_desc);
-		connector_subtest("dp-crc-single", DisplayPort)
-			test_display_all_modes(&data, port, DRM_FORMAT_XRGB8888,
-					       CHAMELIUM_CHECK_CRC, 1);
+	igt_describe(test_display_all_modes_desc);
+	connector_test("dp-crc-single", DisplayPort, &data, test_display_all_modes,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_CRC, 1);
 
-		igt_describe(test_display_one_mode_desc);
-		connector_subtest("dp-crc-fast", DisplayPort)
-			test_display_one_mode(&data, port, DRM_FORMAT_XRGB8888,
-					      CHAMELIUM_CHECK_CRC, 1);
+	igt_describe(test_display_one_mode_desc);
+	connector_test("dp-crc-fast", DisplayPort, &data, test_display_one_mode,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_CRC, 1);
 
-		igt_describe(test_display_all_modes_desc);
-		connector_subtest("dp-crc-multiple", DisplayPort)
-			test_display_all_modes(&data, port, DRM_FORMAT_XRGB8888,
-					       CHAMELIUM_CHECK_CRC, 3);
+	igt_describe(test_display_all_modes_desc);
+	connector_test("dp-crc-multiple", DisplayPort, &data, test_display_all_modes,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_CRC, 3);
 
-		igt_describe(test_display_frame_dump_desc);
-		connector_subtest("dp-frame-dump", DisplayPort)
-			test_display_frame_dump(&data, port);
-	}
+	igt_describe(test_display_frame_dump_desc);
+	connector_test("dp-frame-dump", DisplayPort, &data, test_display_frame_dump);
 
 	igt_describe("HDMI tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_HDMIA,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_display_all_modes_desc);
-		connector_subtest("hdmi-crc-single", HDMIA)
-			test_display_all_modes(&data, port, DRM_FORMAT_XRGB8888,
-					       CHAMELIUM_CHECK_CRC, 1);
+	igt_describe(test_display_all_modes_desc);
+	connector_test("hdmi-crc-single", HDMIA, &data, test_display_all_modes,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_CRC, 1);
 
-		igt_describe(test_display_one_mode_desc);
-		connector_subtest("hdmi-crc-fast", HDMIA)
-			test_display_one_mode(&data, port, DRM_FORMAT_XRGB8888,
-					      CHAMELIUM_CHECK_CRC, 1);
+	igt_describe(test_display_one_mode_desc);
+	connector_test("hdmi-crc-fast", HDMIA, &data, test_display_one_mode,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_CRC, 1);
 
-		igt_describe(test_display_all_modes_desc);
-		connector_subtest("hdmi-crc-multiple", HDMIA)
-			test_display_all_modes(&data, port, DRM_FORMAT_XRGB8888,
-					       CHAMELIUM_CHECK_CRC, 3);
+	igt_describe(test_display_all_modes_desc);
+	connector_test("hdmi-crc-multiple", HDMIA, &data, test_display_all_modes,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_CRC, 3);
 
-		igt_describe(test_display_one_mode_desc);
-		connector_dynamic_subtest("hdmi-crc-nonplanar-formats", HDMIA)
-		{
+	igt_describe(test_display_one_mode_desc);
+	connector_dynamic_subtest("hdmi-crc-nonplanar-formats", HDMIA)
+	{
 			int k;
 			igt_output_t *output;
 			igt_plane_t *primary;
@@ -1080,14 +1060,13 @@ int igt_main()
 			}
 		}
 
-		igt_describe(test_display_planes_random_desc);
-		connector_subtest("hdmi-crc-planes-random", HDMIA)
-			test_display_planes_random(&data, port,
-						   CHAMELIUM_CHECK_CRC);
+	igt_describe(test_display_planes_random_desc);
+	connector_test("hdmi-crc-planes-random", HDMIA, &data, test_display_planes_random,
+		       CHAMELIUM_CHECK_CRC);
 
-		igt_describe(test_display_one_mode_desc);
-		connector_dynamic_subtest("hdmi-cmp-planar-formats", HDMIA)
-		{
+	igt_describe(test_display_one_mode_desc);
+	connector_dynamic_subtest("hdmi-cmp-planar-formats", HDMIA)
+	{
 			int k;
 			igt_output_t *output;
 			igt_plane_t *primary;
@@ -1121,33 +1100,21 @@ int igt_main()
 			}
 		}
 
-		igt_describe(test_display_planes_random_desc);
-		connector_subtest("hdmi-cmp-planes-random", HDMIA)
-			test_display_planes_random(
-				&data, port, CHAMELIUM_CHECK_CHECKERBOARD);
+	igt_describe(test_display_planes_random_desc);
+	connector_test("hdmi-cmp-planes-random", HDMIA, &data, test_display_planes_random,
+		       CHAMELIUM_CHECK_CHECKERBOARD);
 
-		igt_describe(test_display_frame_dump_desc);
-		connector_subtest("hdmi-frame-dump", HDMIA)
-			test_display_frame_dump(&data, port);
+	igt_describe(test_display_frame_dump_desc);
+	connector_test("hdmi-frame-dump", HDMIA, &data, test_display_frame_dump);
 
-		igt_describe(test_display_aspect_ratio_desc);
-		connector_subtest("hdmi-aspect-ratio", HDMIA)
-			test_display_aspect_ratio(&data, port);
-	}
+	igt_describe(test_display_aspect_ratio_desc);
+	connector_test("hdmi-aspect-ratio", HDMIA, &data, test_display_aspect_ratio);
 
 	igt_describe("VGA tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_VGA,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_display_all_modes_desc);
-		connector_subtest("vga-frame-dump", VGA)
-			test_display_all_modes(&data, port, DRM_FORMAT_XRGB8888,
-					       CHAMELIUM_CHECK_ANALOG, 1);
-	}
+	igt_describe(test_display_all_modes_desc);
+	connector_test("vga-frame-dump", VGA, &data, test_display_all_modes,
+		       DRM_FORMAT_XRGB8888, CHAMELIUM_CHECK_ANALOG, 1);
 
 	igt_fixture() {
 		igt_display_fini(&data.display);
diff --git a/tests/chamelium/kms_chamelium_hpd.c b/tests/chamelium/kms_chamelium_hpd.c
index 8f13b380a..dd1735956 100644
--- a/tests/chamelium/kms_chamelium_hpd.c
+++ b/tests/chamelium/kms_chamelium_hpd.c
@@ -465,157 +465,117 @@ IGT_TEST_DESCRIPTION("Testing HPD with a Chamelium board");
 int igt_main()
 {
 	chamelium_data_t data;
-	struct chamelium_port *port;
-	int p;
 
 	igt_fixture() {
 		chamelium_init_test(&data);
 	}
 
 	igt_describe("DisplayPort tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_DisplayPort,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("dp-hpd", DisplayPort)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_DP_HDMI,
-				     TEST_MODESET_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("dp-hpd-fast", DisplayPort) test_hotplug(
-			&data, port, HPD_TOGGLE_COUNT_FAST, TEST_MODESET_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("dp-hpd-enable-disable-mode", DisplayPort)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_FAST,
-				     TEST_MODESET_ON_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("dp-hpd-with-enabled-mode", DisplayPort)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_FAST,
-				     TEST_MODESET_ON);
-
-		igt_describe(test_hotplug_for_each_pipe_desc);
-		connector_subtest("dp-hpd-for-each-pipe", DisplayPort)
-			test_hotplug_for_each_pipe(&data, port);
-
-		igt_describe(test_suspend_resume_hpd_desc);
-		connector_subtest("dp-hpd-after-suspend", DisplayPort)
-			test_suspend_resume_hpd(&data, port, SUSPEND_STATE_MEM,
-						SUSPEND_TEST_NONE);
-
-		igt_describe(test_suspend_resume_hpd_desc);
-		connector_subtest("dp-hpd-after-hibernate", DisplayPort)
-			test_suspend_resume_hpd(&data, port, SUSPEND_STATE_DISK,
-						SUSPEND_TEST_DEVICES);
-
-		igt_describe(test_hpd_storm_detect_desc);
-		connector_subtest("dp-hpd-storm", DisplayPort)
-			test_hpd_storm_detect(&data, port,
-					      HPD_STORM_PULSE_INTERVAL_DP);
-
-		igt_describe(test_hpd_storm_disable_desc);
-		connector_subtest("dp-hpd-storm-disable", DisplayPort)
-			test_hpd_storm_disable(&data, port,
-					       HPD_STORM_PULSE_INTERVAL_DP);
-	}
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("dp-hpd", DisplayPort, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_DP_HDMI, TEST_MODESET_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("dp-hpd-fast", DisplayPort, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("dp-hpd-enable-disable-mode", DisplayPort, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_ON_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("dp-hpd-with-enabled-mode", DisplayPort, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_ON);
+
+	igt_describe(test_hotplug_for_each_pipe_desc);
+	connector_test("dp-hpd-for-each-pipe", DisplayPort, &data,
+		       test_hotplug_for_each_pipe);
+
+	igt_describe(test_suspend_resume_hpd_desc);
+	connector_test("dp-hpd-after-suspend", DisplayPort, &data, test_suspend_resume_hpd,
+		       SUSPEND_STATE_MEM, SUSPEND_TEST_NONE);
+
+	igt_describe(test_suspend_resume_hpd_desc);
+	connector_test("dp-hpd-after-hibernate", DisplayPort, &data, test_suspend_resume_hpd,
+		       SUSPEND_STATE_DISK, SUSPEND_TEST_DEVICES);
+
+	igt_describe(test_hpd_storm_detect_desc);
+	connector_test("dp-hpd-storm", DisplayPort, &data, test_hpd_storm_detect,
+		       HPD_STORM_PULSE_INTERVAL_DP);
+
+	igt_describe(test_hpd_storm_disable_desc);
+	connector_test("dp-hpd-storm-disable", DisplayPort, &data, test_hpd_storm_disable,
+		       HPD_STORM_PULSE_INTERVAL_DP);
 
 	igt_describe("HDMI tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_HDMIA,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("hdmi-hpd", HDMIA)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_DP_HDMI,
-				     TEST_MODESET_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("hdmi-hpd-fast", HDMIA) test_hotplug(
-			&data, port, HPD_TOGGLE_COUNT_FAST, TEST_MODESET_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("hdmi-hpd-enable-disable-mode", HDMIA)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_FAST,
-				     TEST_MODESET_ON_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("hdmi-hpd-with-enabled-mode", HDMIA)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_FAST,
-				     TEST_MODESET_ON);
-
-		igt_describe(test_hotplug_for_each_pipe_desc);
-		connector_subtest("hdmi-hpd-for-each-pipe", HDMIA)
-			test_hotplug_for_each_pipe(&data, port);
-
-		igt_describe(test_suspend_resume_hpd_desc);
-		connector_subtest("hdmi-hpd-after-suspend", HDMIA)
-			test_suspend_resume_hpd(&data, port, SUSPEND_STATE_MEM,
-						SUSPEND_TEST_NONE);
-
-		igt_describe(test_suspend_resume_hpd_desc);
-		connector_subtest("hdmi-hpd-after-hibernate", HDMIA)
-			test_suspend_resume_hpd(&data, port, SUSPEND_STATE_DISK,
-						SUSPEND_TEST_DEVICES);
-
-		igt_describe(test_hpd_storm_detect_desc);
-		connector_subtest("hdmi-hpd-storm", HDMIA)
-			test_hpd_storm_detect(&data, port,
-					      HPD_STORM_PULSE_INTERVAL_HDMI);
-
-		igt_describe(test_hpd_storm_disable_desc);
-		connector_subtest("hdmi-hpd-storm-disable", HDMIA)
-			test_hpd_storm_disable(&data, port,
-					       HPD_STORM_PULSE_INTERVAL_HDMI);
-	}
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("hdmi-hpd", HDMIA, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_DP_HDMI, TEST_MODESET_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("hdmi-hpd-fast", HDMIA, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("hdmi-hpd-enable-disable-mode", HDMIA, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_ON_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("hdmi-hpd-with-enabled-mode", HDMIA, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_ON);
+
+	igt_describe(test_hotplug_for_each_pipe_desc);
+	connector_test("hdmi-hpd-for-each-pipe", HDMIA, &data, test_hotplug_for_each_pipe);
+
+	igt_describe(test_suspend_resume_hpd_desc);
+	connector_test("hdmi-hpd-after-suspend", HDMIA, &data, test_suspend_resume_hpd,
+		       SUSPEND_STATE_MEM, SUSPEND_TEST_NONE);
+
+	igt_describe(test_suspend_resume_hpd_desc);
+	connector_test("hdmi-hpd-after-hibernate", HDMIA, &data, test_suspend_resume_hpd,
+		       SUSPEND_STATE_DISK, SUSPEND_TEST_DEVICES);
+
+	igt_describe(test_hpd_storm_detect_desc);
+	connector_test("hdmi-hpd-storm", HDMIA, &data, test_hpd_storm_detect,
+		       HPD_STORM_PULSE_INTERVAL_HDMI);
+
+	igt_describe(test_hpd_storm_disable_desc);
+	connector_test("hdmi-hpd-storm-disable", HDMIA, &data, test_hpd_storm_disable,
+		       HPD_STORM_PULSE_INTERVAL_HDMI);
 
 	igt_describe("VGA tests");
-	igt_subtest_group() {
-		igt_fixture() {
-			chamelium_require_connector_present(
-				data.ports, DRM_MODE_CONNECTOR_VGA,
-				data.port_count, 1);
-		}
 
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("vga-hpd", VGA) test_hotplug(
-			&data, port, HPD_TOGGLE_COUNT_VGA, TEST_MODESET_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("vga-hpd-fast", VGA) test_hotplug(
-			&data, port, HPD_TOGGLE_COUNT_FAST, TEST_MODESET_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("vga-hpd-enable-disable-mode", VGA)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_FAST,
-				     TEST_MODESET_ON_OFF);
-
-		igt_describe(test_basic_hotplug_desc);
-		connector_subtest("vga-hpd-with-enabled-mode", VGA)
-			test_hotplug(&data, port, HPD_TOGGLE_COUNT_FAST,
-				     TEST_MODESET_ON);
-
-		igt_describe(test_suspend_resume_hpd_desc);
-		connector_subtest("vga-hpd-after-suspend", VGA)
-			test_suspend_resume_hpd(&data, port, SUSPEND_STATE_MEM,
-						SUSPEND_TEST_NONE);
-
-		igt_describe(test_suspend_resume_hpd_desc);
-		connector_subtest("vga-hpd-after-hibernate", VGA)
-			test_suspend_resume_hpd(&data, port, SUSPEND_STATE_DISK,
-						SUSPEND_TEST_DEVICES);
-
-		igt_describe(test_hpd_without_ddc_desc);
-		connector_subtest("vga-hpd-without-ddc", VGA)
-			test_hpd_without_ddc(&data, port);
-	}
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("vga-hpd", VGA, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_VGA, TEST_MODESET_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("vga-hpd-fast", VGA, &data, test_hotplug,
+		       HPD_TOGGLE_COUNT_FAST, TEST_MODESET_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("vga-hpd-enable-disable-mode", VGA, &data,
+		       test_hotplug, HPD_TOGGLE_COUNT_FAST, TEST_MODESET_ON_OFF);
+
+	igt_describe(test_basic_hotplug_desc);
+	connector_test("vga-hpd-with-enabled-mode", VGA, &data,
+		       test_hotplug, HPD_TOGGLE_COUNT_FAST, TEST_MODESET_ON);
+
+	igt_describe(test_suspend_resume_hpd_desc);
+	connector_test("vga-hpd-after-suspend", VGA, &data,
+		       test_suspend_resume_hpd, SUSPEND_STATE_MEM, SUSPEND_TEST_NONE);
+
+	igt_describe(test_suspend_resume_hpd_desc);
+	connector_test("vga-hpd-after-hibernate", VGA, &data,
+		       test_suspend_resume_hpd, SUSPEND_STATE_DISK, SUSPEND_TEST_DEVICES);
+
+	igt_describe(test_hpd_without_ddc_desc);
+	connector_test("vga-hpd-without-ddc", VGA, &data, test_hpd_without_ddc);
+
+	igt_describe(test_hotplug_for_each_pipe_desc);
+	connector_test("vga-hpd-for-each-pipe", VGA, &data, test_hotplug_for_each_pipe);
 
 	igt_describe("Tests that operate on all connectors");
 	igt_subtest_group() {
@@ -635,9 +595,6 @@ int igt_main()
 						       SUSPEND_TEST_DEVICES);
 	}
 
-	igt_describe(test_hotplug_for_each_pipe_desc);
-	connector_subtest("vga-hpd-for-each-pipe", VGA)
-		test_hotplug_for_each_pipe(&data, port);
 
 	igt_fixture() {
 		igt_display_fini(&data.display);
-- 
2.48.1