diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-01-05 14:13:34 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-01-05 14:21:48 +0100 |
| commit | bf511f3f7ebfec1cd19e94c6f463d96f420432b4 (patch) | |
| tree | d449e12ace325cc56b0f7846ec857d1b413c6beb | |
| parent | cc65dbc902daf6b5667aa1924584a91653f47d13 (diff) | |
kms_pipe_crc_basic: Stop looking at output->valid
Use the proper iterator macros to prevent ever having an invalid config.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
| -rw-r--r-- | tests/kms_pipe_crc_basic.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c index b106f9bd..dd2ad3c3 100644 --- a/tests/kms_pipe_crc_basic.c +++ b/tests/kms_pipe_crc_basic.c @@ -89,7 +89,7 @@ static void test_bad_source(data_t *data) #define TEST_SEQUENCE (1<<0) #define TEST_NONBLOCK (1<<1) -static int +static void test_read_crc_for_output(data_t *data, int pipe, igt_output_t *output, unsigned flags) { @@ -105,12 +105,6 @@ test_read_crc_for_output(data_t *data, int pipe, igt_output_t *output, int n_crcs; igt_output_set_pipe(output, pipe); - igt_display_commit(display); - - if (!output->valid) { - igt_output_set_pipe(output, PIPE_ANY); - return 0; - } igt_debug("Clearing the fb with color (%.02lf,%.02lf,%.02lf)\n", colors[c].r, colors[c].g, colors[c].b); @@ -180,8 +174,6 @@ test_read_crc_for_output(data_t *data, int pipe, igt_output_t *output, igt_output_set_pipe(output, PIPE_ANY); } - - return 1; } static void test_read_crc(data_t *data, int pipe, unsigned flags) @@ -192,13 +184,14 @@ static void test_read_crc(data_t *data, int pipe, unsigned flags) igt_skip_on(pipe >= data->display.n_pipes); - for_each_connected_output(display, output) { + for_each_valid_output_on_pipe(display, pipe, output) { igt_info("%s: Testing connector %s using pipe %s\n", igt_subtest_name(), igt_output_name(output), kmstest_pipe_name(pipe)); - valid_connectors += test_read_crc_for_output(data, pipe, output, flags); + test_read_crc_for_output(data, pipe, output, flags); + valid_connectors ++; } igt_require_f(valid_connectors, "No connector found for pipe %i\n", pipe); |