From 5d46f68eab1cb6bdaa52eff33bcb0d61149eca3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Tue, 9 Dec 2014 22:33:16 +0200 Subject: [PATCH] tests/kms_cursor_crc: Restore the valid pipe/connector combo check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The valid pipe/connector combo check was lost in commit 57259d714d3fe1170cf931af72648219856a9918 Author: Daniel Vetter Date: Mon Nov 24 16:08:32 2014 +0100 lib/igt_debugfs: Don't setup crc in _new Restore it to make the test again useful on CHV. Cc: Daniel Vetter Signed-off-by: Ville Syrjälä --- tests/kms_cursor_crc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c index 875ac30e..e1390a7f 100644 --- a/tests/kms_cursor_crc.c +++ b/tests/kms_cursor_crc.c @@ -230,7 +230,7 @@ static void test_crc_random(data_t *data) } } -static void prepare_crtc(data_t *data, igt_output_t *output, +static bool prepare_crtc(data_t *data, igt_output_t *output, int cursor_w, int cursor_h) { drmModeModeInfo *mode; @@ -245,7 +245,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, if (!output->valid) { igt_output_set_pipe(output, PIPE_ANY); igt_display_commit(display); - return; + return false; } /* create and set the primary plane fb */ @@ -284,6 +284,8 @@ static void prepare_crtc(data_t *data, igt_output_t *output, /* get reference crc w/o cursor */ igt_pipe_crc_collect_crc(data->pipe_crc, &data->ref_crc); + + return true; } static void cleanup_crtc(data_t *data, igt_output_t *output) @@ -318,7 +320,8 @@ static void run_test(data_t *data, void (*testfunc)(data_t *), int cursor_w, int for_each_pipe(display, p) { data->pipe = p; - prepare_crtc(data, output, cursor_w, cursor_h); + if (!prepare_crtc(data, output, cursor_w, cursor_h)) + continue; valid_tests++;