diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-11-29 11:38:09 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-11-29 11:41:28 +0100 |
| commit | dde585fbb8f1f9b3977e2a8f26697aa60a79aa8b (patch) | |
| tree | dfbc7b7297c1048f2d55d50292799ec515e2fca5 /tests/kms_atomic_transition.c | |
| parent | e6b929f1e88b6508dca4a92354b0db8bc8869e5d (diff) | |
kms_atomic_transition: Add test timeout to run_modeset_tests
This fixes the hang on kms_atomic_transitions.1x-modeset-transitions.
Underlying cause still needs more looking at..
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'tests/kms_atomic_transition.c')
| -rw-r--r-- | tests/kms_atomic_transition.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 3b981e51..099178e1 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -376,6 +376,10 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non igt_display_commit_atomic(display, flags, NULL); + igt_debug("Event mask: %x, waiting for %i events\n", event_mask, num_events); + + igt_set_timeout(30, "Waiting for %i events timed out\n", event_mask); + while (num_events) { char buf[32]; struct drm_event *e = (void *)buf; @@ -403,6 +407,8 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non num_events--; } + + igt_reset_timeout(); } static unsigned set_combinations(igt_display_t *display, unsigned mask, struct igt_fb *fb) |