diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-06-19 14:06:40 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-06-20 11:01:01 +0200 |
commit | 3671dfc264da055ed36786caf8abc8843e003a1b (patch) | |
tree | 1c9b48d977de00d66d426773ecd3cd61ad21a958 /tests | |
parent | 1345a21886d7606b59225d3c4f5e03fa913e1ac7 (diff) |
tests/kms_busy: Add test to reproduce the CI kms_flip killer
When aborting kms_flip.render-flip-vs-modeset in CI the test hangs
on RMFB. Make a test that simulates nonblocking stuck pageflip vs
blocking modeset.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_busy.c | 66 |
1 files changed, 44 insertions, 22 deletions
diff --git a/tests/kms_busy.c b/tests/kms_busy.c index 731ace47..af7ed992 100644 --- a/tests/kms_busy.c +++ b/tests/kms_busy.c @@ -282,6 +282,36 @@ static void test_hang(igt_display_t *dpy, unsigned ring, igt_remove_fb(dpy->drm_fd, &fb[0]); } +static void test_pageflip_modeset_hang(igt_display_t *dpy, + unsigned ring, enum pipe pipe) +{ + struct igt_fb fb; + struct drm_event_vblank ev; + igt_output_t *output; + igt_plane_t *primary; + igt_spin_t *t; + + igt_require((output = set_fb_on_crtc(dpy, pipe, &fb))); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_display_commit2(dpy, dpy->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); + + t = igt_spin_batch_new(dpy->drm_fd, ring, fb.gem_handle); + + do_or_die(drmModePageFlip(dpy->drm_fd, dpy->pipes[pipe].crtc_id, fb.fb_id, DRM_MODE_PAGE_FLIP_EVENT, &fb)); + + /* Kill crtc with hung fb */ + igt_plane_set_fb(primary, NULL); + igt_output_set_pipe(output, PIPE_NONE); + igt_display_commit2(dpy, dpy->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); + + igt_assert(read(dpy->drm_fd, &ev, sizeof(ev)) == sizeof(ev)); + + igt_spin_batch_end(t); + + igt_remove_fb(dpy->drm_fd, &fb); +} + igt_main { igt_display_t display = { .drm_fd = -1, .n_pipes = IGT_MAX_PIPES }; @@ -331,47 +361,41 @@ igt_main igt_hang_t hang; igt_fixture { - igt_require(display.is_atomic); + igt_require(gem_has_ring(display.drm_fd, + e->exec_id | e->flags)); hang = igt_allow_hang(display.drm_fd, 0, 0); } - igt_subtest_f("extended-pageflip-hang-oldfb-%s-%s", + igt_subtest_f("extended-pageflip-modeset-hang-oldfb-%s-%s", e->name, kmstest_pipe_name(n)) { igt_require(gem_has_ring(display.drm_fd, e->exec_id | e->flags)); - test_hang(&display, e->exec_id | e->flags, n, false, false); + test_pageflip_modeset_hang(&display, e->exec_id | e->flags, n); } - igt_subtest_f("extended-pageflip-hang-newfb-%s-%s", - e->name, kmstest_pipe_name(n)) { - igt_require(gem_has_ring(display.drm_fd, - e->exec_id | e->flags)); + igt_fixture + igt_require(display.is_atomic); + + igt_subtest_f("extended-pageflip-hang-oldfb-%s-%s", + e->name, kmstest_pipe_name(n)) + test_hang(&display, e->exec_id | e->flags, n, false, false); + igt_subtest_f("extended-pageflip-hang-newfb-%s-%s", + e->name, kmstest_pipe_name(n)) test_hang(&display, e->exec_id | e->flags, n, false, true); - } igt_subtest_f("extended-modeset-hang-oldfb-%s-%s", - e->name, kmstest_pipe_name(n)) { - igt_require(gem_has_ring(display.drm_fd, - e->exec_id | e->flags)); - + e->name, kmstest_pipe_name(n)) test_hang(&display, e->exec_id | e->flags, n, true, false); - } igt_subtest_f("extended-modeset-hang-newfb-%s-%s", - e->name, kmstest_pipe_name(n)) { - igt_require(gem_has_ring(display.drm_fd, - e->exec_id | e->flags)); - + e->name, kmstest_pipe_name(n)) test_hang(&display, e->exec_id | e->flags, n, true, true); - } igt_subtest_f("extended-modeset-hang-oldfb-with-reset-%s-%s", e->name, kmstest_pipe_name(n)) { - igt_require(gem_has_ring(display.drm_fd, - e->exec_id | e->flags)); igt_set_module_param_int("force_reset_modeset_test", 1); test_hang(&display, e->exec_id | e->flags, n, true, false); @@ -381,8 +405,6 @@ igt_main igt_subtest_f("extended-modeset-hang-newfb-with-reset-%s-%s", e->name, kmstest_pipe_name(n)) { - igt_require(gem_has_ring(display.drm_fd, - e->exec_id | e->flags)); igt_set_module_param_int("force_reset_modeset_test", 1); test_hang(&display, e->exec_id | e->flags, n, true, true); |