[PATCH i-g-t v2 12/16] tests/kms_sharpness_filter: limit #outputs tested during suspend

Michał Grzelak <[email protected]>
Newsgroups org.freedesktop.lists.igt-dev
Organization Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316
Message-ID <[email protected]>
We are iterating through each output while testing suspend. This results
in extended execution time. In turn this leads to hitting CI enforced
timeout.

By default limit number of tested outputs to 3. Test each connected
output when passing command-line parameter.

v1->v2
- remove abbreviations (Jani)

Signed-off-by: Michał Grzelak <[email protected]>
Reviewed-by: Nemesa Garg <[email protected]>
---
 tests/intel/kms_sharpness_filter.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/intel/kms_sharpness_filter.c b/tests/intel/kms_sharpness_filter.c
index f2e3fc9494..adec4a60c5 100644
--- a/tests/intel/kms_sharpness_filter.c
+++ b/tests/intel/kms_sharpness_filter.c
@@ -74,6 +74,8 @@ IGT_TEST_DESCRIPTION("Test to validate content adaptive sharpness filter");
  * is seen without corruption for each subtest.
  */
 
+#define OUTPUT_LIMIT 			3
+
 #define TAP_3				3
 #define TAP_5				5
 #define TAP_7				7
@@ -231,6 +233,7 @@ static const struct subtest_entry {
 typedef struct {
 	int drm_fd;
 	bool limited;
+	bool all_outputs;
 	struct igt_fb fb[4];
 	igt_crtc_t *crtc;
 	igt_display_t display;
@@ -614,9 +617,16 @@ run_sharpness_filter_test(data_t *data, enum test_type type)
 	igt_display_t *display = &data->display;
 	igt_output_t *output;
 	igt_crtc_t *crtc;
+	int output_counter = 0;
 	char name[40];
 
 	for_each_connected_output(display, output) {
+		if (type == TEST_FILTER_SUSPEND && !data->all_outputs &&
+		    output_counter > OUTPUT_LIMIT)
+			continue;
+
+		output_counter++;
+
 		for_each_crtc(display, crtc) {
 			igt_display_reset(display);
 
@@ -766,6 +776,9 @@ static int opt_handler(int opt, int opt_index, void *_data)
 	case 'l':
 		data->limited = true;
 		break;
+	case 'o':
+		data->all_outputs = true;
+		break;
 	default:
 		return IGT_OPT_HANDLER_ERROR;
 	}
@@ -774,11 +787,12 @@ static int opt_handler(int opt, int opt_index, void *_data)
 }
 
 static const char help_str[] =
-	"  --limited|-l\t\tLimit execution to 1 valid pipe-output combo\n";
+	"  --limited|-l\t\tLimit execution to 1 valid pipe-output combo\n"
+	"  --all-outputs|-o\t\tExtend suspend tests for all outputs\n";
 
 data_t data = {};
 
-int igt_main_args("l", NULL, help_str, opt_handler, &data)
+int igt_main_args("lo", NULL, help_str, opt_handler, &data)
 {
 	igt_fixture() {
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
-- 
2.45.2
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.