[igt-dev] [PATCH i-g-t v1] tests/kms_chamelium: Fix common suspend/hibernate

Kunal Joshi kunal1.joshi at intel.com
Fri Sep 9 07:42:54 UTC 2022


Currently test executes and fails even if no ports are connected to
chamelium, Added a igt_fixture to prevent that from happening.

Cc: Petri Latvala <petri.latvala at intel.com>
Signed-off-by: Kunal Joshi <kunal1.joshi at intel.com>
---
 tests/chamelium/kms_chamelium.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/chamelium/kms_chamelium.c b/tests/chamelium/kms_chamelium.c
index d97b439a..bd1fa4ad 100644
--- a/tests/chamelium/kms_chamelium.c
+++ b/tests/chamelium/kms_chamelium.c
@@ -577,19 +577,19 @@ test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state,
 	for (p = 0; p < data->port_count; p++) {
 		port = data->ports[p];
 		igt_debug("Testing port %s\n", chamelium_port_get_name(port));
-	}
 
-	igt_modeset_disable_all_outputs(&data->display);
-	chamelium_reset_state(&data->display, data->chamelium, NULL,
-			      data->ports, data->port_count);
+		igt_modeset_disable_all_outputs(&data->display);
+		chamelium_reset_state(&data->display, data->chamelium, NULL,
+				      data->ports, data->port_count);
 
-	/* Make sure we notice new connectors after resuming */
-	try_suspend_resume_hpd(data, NULL, state, test, mon, false);
+		/* Make sure we notice new connectors after resuming */
+		try_suspend_resume_hpd(data, NULL, state, test, mon, false);
 
-	/* Now make sure we notice disconnected connectors after resuming */
-	try_suspend_resume_hpd(data, NULL, state, test, mon, true);
+		/* Now make sure we notice disconnected connectors after resuming */
+		try_suspend_resume_hpd(data, NULL, state, test, mon, true);
 
-	igt_cleanup_uevents(mon);
+		igt_cleanup_uevents(mon);
+	}
 }
 
 static const char test_suspend_resume_edid_change_desc[] =
@@ -2945,6 +2945,11 @@ igt_main
 
 	igt_describe("Tests that operate on all connectors");
 	igt_subtest_group {
+
+		igt_fixture {
+			igt_require(data.port_count);
+		}
+
 		igt_describe(test_suspend_resume_hpd_common_desc);
 		igt_subtest("common-hpd-after-suspend")
 			test_suspend_resume_hpd_common(&data,
-- 
2.25.1



More information about the igt-dev mailing list