diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-20 15:45:31 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-20 15:45:31 +0200 |
| commit | c75dcbdac51dcc2d631a4a45049c9421e0229e16 (patch) | |
| tree | 20d0e794d8c762a06768266bda10f6b473c82a87 | |
| parent | 89152791e2ebde5e05c51fc070e3eaa462701f74 (diff) | |
tests/kms_flip: various improvements
- Some debug logging for the ts continuity checks.
- Add a plain vblank-vs-suspend test where kms_flip doesn't switch off
the displays first.
- Ensure that we do at least 2 rounds, the suspend tests bailed out
after 1 round and so didn't test anything.
- Frob the testnames a bit.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | tests/kms_flip.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 634b6274..dd641821 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -574,6 +574,9 @@ static void check_state(struct test_output *o, struct event_state *es) igt_assert_f(es->current_seq - es->last_seq <= 100, "unexpected %s seq %u, should be < %u\n", es->name, es->current_seq, es->last_seq + 100); + + igt_debug("testing ts continuity: Current frame %u, old frame %u\n", + es->current_seq, es->last_seq); } if ((o->flags & TEST_CHECK_TS) && (!analog_tv_connector(o))) { @@ -1176,6 +1179,7 @@ static unsigned event_loop(struct test_output *o, unsigned duration_ms) { unsigned long start, end; uint32_t hang = 0; /* Suppress GCC warning */ + int count = 0; if (o->flags & TEST_HANG_ONCE) { hang = hang_gpu(drm_fd); @@ -1193,8 +1197,10 @@ static unsigned event_loop(struct test_output *o, unsigned duration_ms) check_all_state(o, completed_events); update_all_state(o, completed_events); - if ((gettime_us() - start) / 1000 >= duration_ms) + if (count && (gettime_us() - start) / 1000 >= duration_ms) break; + + count++; } end = gettime_us(); @@ -1563,10 +1569,11 @@ int main(int argc, char **argv) { 0, TEST_ENOENT | TEST_NOEVENT, "nonexisting-fb" }, { 10, TEST_DPMS_OFF | TEST_DPMS | TEST_VBLANK_RACE, "dpms-vs-vblank-race" }, { 10, TEST_MODESET | TEST_VBLANK_RACE, "modeset-vs-vblank-race" }, - { 10, TEST_VBLANK | TEST_DPMS | TEST_RPM | TEST_TS_CONT, "dpms-vs-rpm" }, - { 10, TEST_VBLANK | TEST_DPMS | TEST_SUSPEND | TEST_TS_CONT, "dpms-vs-suspend" }, - { 0, TEST_VBLANK | TEST_MODESET | TEST_RPM | TEST_TS_CONT, "modeset-vs-rpm" }, - { 0, TEST_VBLANK | TEST_MODESET | TEST_SUSPEND | TEST_TS_CONT, "modeset-vs-suspend" }, + { 10, TEST_VBLANK | TEST_DPMS | TEST_RPM | TEST_TS_CONT, "vblank-vs-dpms-rpm" }, + { 10, TEST_VBLANK | TEST_MODESET | TEST_RPM | TEST_TS_CONT, "vblank-vs-modeset-rpm" }, + { 0, TEST_VBLANK | TEST_DPMS | TEST_SUSPEND | TEST_TS_CONT, "vblank-vs-dpms-suspend" }, + { 0, TEST_VBLANK | TEST_MODESET | TEST_SUSPEND | TEST_TS_CONT, "vblank-vs-modeset-suspend" }, + { 0, TEST_VBLANK | TEST_SUSPEND | TEST_TS_CONT, "vblank-vs-suspend" }, { 0, TEST_BO_TOOBIG | TEST_NO_2X_OUTPUT, "bo-too-big" }, }; int i; |