diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-12-09 22:33:16 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-12-09 22:35:36 +0200 |
| commit | 5d46f68eab1cb6bdaa52eff33bcb0d61149eca3d (patch) | |
| tree | d4d198a7c06393b9a9d23f8b196fca2e1d555c78 /tests/kms_cursor_crc.c | |
| parent | b6f68c10b4ee2b730baeb8129aba36b5210ac291 (diff) | |
tests/kms_cursor_crc: Restore the valid pipe/connector combo check
The valid pipe/connector combo check was lost in
commit 57259d714d3fe1170cf931af72648219856a9918
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
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 <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'tests/kms_cursor_crc.c')
| -rw-r--r-- | tests/kms_cursor_crc.c | 9 |
1 files 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++; |