From a636371c0aac1c9119900634d4a56f53e923b9b7 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Tue, 9 Apr 2019 16:48:00 +0300 Subject: tests/kms_plane_multiple: Run only on the first valid output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no real need for testing on each output, as they do not affect CRC coming out from the pipe. Let's use first viable one. Cc: Maarten Lankhorst Cc: Martin Peres Signed-off-by: Arkadiusz Hiler Reviewed-by: Ville Syrjälä --- tests/kms_plane_multiple.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c index bfaeeded..d2d02a5f 100644 --- a/tests/kms_plane_multiple.c +++ b/tests/kms_plane_multiple.c @@ -302,41 +302,25 @@ static void test_plane_position(data_t *data, enum pipe pipe, uint64_t tiling) { igt_output_t *output; - int connected_outs; int n_planes = data->display.pipes[pipe].n_planes; + output = igt_get_single_output_for_pipe(&data->display, pipe); + igt_require(output); + if (!opt.user_seed) opt.seed = time(NULL); srand(opt.seed); - connected_outs = 0; - for_each_valid_output_on_pipe(&data->display, pipe, output) { - test_plane_position_with_output(data, pipe, - output, - n_planes, - tiling); - connected_outs++; - } - - igt_skip_on(connected_outs == 0); - + test_plane_position_with_output(data, pipe, output, + n_planes, tiling); } static void run_tests_for_pipe(data_t *data, enum pipe pipe) { - igt_output_t *output; - igt_fixture { - int valid_tests = 0; - igt_skip_on(pipe >= data->display.n_pipes); - - for_each_valid_output_on_pipe(&data->display, pipe, output) - valid_tests++; - - igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); igt_require(data->display.pipes[pipe].n_planes > 0); } -- cgit v1.2.3