From 4405f3953ccd3ca3f8ac34e0369739f3e91b26de Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Wed, 1 Nov 2017 14:20:45 +0100 Subject: tests/kms_flip: Move kms_flip.vblank-vs-hang to kms_vblank, v4. There's no need to test this more than once. Add a NOHANG flag which can be used to specify that a subtest can not be run when hanging. If it's set on either the subtest or the mode, the -hang test for this combination will not be generated. Changes since v1: - Merge the patch that renamed HANG to NOHANG. - Rebase after 'reorganize subtests by type'. - Allow subtests to specify NOHANG too. Changes since v2: - Mark accuracy test with NOHANG, gpu reset disables interrupts, causing the test to fail. Changes since v3: - Rebase on top of subtest split changes. - Add nohang comment to accuracy test. (Daniel) Signed-off-by: Maarten Lankhorst Reviewed-by: Daniel Vetter --- tests/kms_vblank.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'tests/kms_vblank.c') diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c index d5f5aa0b..04675c26 100644 --- a/tests/kms_vblank.c +++ b/tests/kms_vblank.c @@ -54,6 +54,7 @@ typedef struct { #define IDLE 1 #define BUSY 2 #define FORKED 4 +#define NOHANG 8 } data_t; static double elapsed(const struct timespec *start, @@ -120,6 +121,7 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int)) igt_display_t *display = &data->display; igt_output_t *output = data->output; int fd = display->drm_fd; + igt_hang_t hang; prepare_crtc(data, fd, output); @@ -127,6 +129,9 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int)) igt_subtest_name(), kmstest_pipe_name(data->pipe), igt_output_name(output), nchildren); + if (!(data->flags & NOHANG)) + hang = igt_hang_ring(fd, I915_EXEC_DEFAULT); + if (data->flags & BUSY) { union drm_wait_vblank vbl; @@ -149,6 +154,9 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int)) igt_assert(poll(&(struct pollfd){fd, POLLIN}, 1, 0) == 0); + if (!(data->flags & NOHANG)) + igt_post_hang_ring(fd, hang); + igt_info("\n%s on pipe %s, connector %s: PASSED\n\n", igt_subtest_name(), kmstest_pipe_name(data->pipe), igt_output_name(output)); @@ -315,7 +323,11 @@ static void run_subtests_for_pipe(data_t *data) void (*func)(data_t *, int, int); unsigned int valid; } funcs[] = { - { "accuracy", accuracy, IDLE }, + /* + * GPU reset recovery may disable irqs or reset display, so + * accuracy tests will fail in the hang case, disable this test. + */ + { "accuracy", accuracy, IDLE | NOHANG }, { "query", vblank_query, IDLE | FORKED | BUSY }, { "wait", vblank_wait, IDLE | FORKED | BUSY }, { } @@ -337,12 +349,25 @@ static void run_subtests_for_pipe(data_t *data) for (f = funcs; f->name; f++) { for (m = modes; m->name; m++) { - if (m->flags & ~f->valid) + if (m->flags & ~(f->valid | NOHANG)) continue; igt_subtest_f("pipe-%s-%s-%s", kmstest_pipe_name(data->pipe), f->name, m->name) { + for_each_valid_output_on_pipe(&data->display, data->pipe, data->output) { + data->flags = m->flags | NOHANG; + run_test(data, f->func); + } + } + + /* Skip the -hang version if NOHANG flag is set */ + if (f->valid & NOHANG || m->flags & NOHANG) + continue; + + igt_subtest_f("pipe-%s-%s-%s-hang", + kmstest_pipe_name(data->pipe), + f->name, m->name) { for_each_valid_output_on_pipe(&data->display, data->pipe, data->output) { data->flags = m->flags; run_test(data, f->func); -- cgit v1.2.3