summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyude Paul <lyude@redhat.com>2020-01-05 17:29:45 -0500
committerLyude Paul <lyude@redhat.com>2020-08-26 12:10:00 -0400
commitcff08652eb9b8555202adc5154e04ef9dc018eab (patch)
treeceefad2d1bbec15f183f87c126a0b647db55150c
parentf1d0c240ea2e631dfb9f493f37f8fb61cb2b1cf2 (diff)
tests/kms_pipe_crc_basic: Use igt_display_require_output_on_pipe()
Refactor test_read_crc() to use igt_display_require_output_on_pipe() rather than checking the validity of the pipe and output separately. v3: Improve commit message v2: Rebase Reviewed-by: Jeremy Cline <jcline@redhat.com> Signed-off-by: Lyude Paul <lyude@redhat.com>
-rw-r--r--tests/kms_pipe_crc_basic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index bb66bc6c..53d76df1 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -65,15 +65,14 @@ static void test_bad_source(data_t *data)
static void test_read_crc(data_t *data, enum pipe pipe, unsigned flags)
{
igt_display_t *display = &data->display;
- igt_output_t *output = igt_get_single_output_for_pipe(display, pipe);
+ igt_output_t *output;
igt_plane_t *primary;
drmModeModeInfo *mode;
igt_crc_t *crcs = NULL;
int c, j;
- igt_require_pipe(display, pipe);
- igt_require_f(output, "No connector found for pipe %s\n",
- kmstest_pipe_name(pipe));
+ igt_display_require_output_on_pipe(display, pipe);
+ output = igt_get_single_output_for_pipe(display, pipe);
igt_display_reset(display);
igt_output_set_pipe(output, pipe);