From: Ville Syrj?l? <ville.syrjala at linux.intel.com>
Do not use the TEST_HANG flag to determine whether page flip events are
used. Add a new TEST_NOEVENT flag that can be used to disable the use
of events instead.
Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com>
---
tests/kms_flip.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index c2a29ae..a42bf97 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -57,6 +57,7 @@
#define TEST_FB_RECREATE (1 << 12)
#define TEST_RMFB (1 << 13)
#define TEST_HANG (1 << 14)
+#define TEST_NOEVENT (1 << 15)
#define EVENT_FLIP (1 << 0)
#define EVENT_VBLANK (1 << 1)
@@ -645,7 +646,7 @@ static unsigned int run_test_step(struct test_output *o)
}
if (do_flip)
- do_or_die(do_page_flip(o, new_fb_id, !(o->flags & TEST_HANG)));
+ do_or_die(do_page_flip(o, new_fb_id, !(o->flags & TEST_NOEVENT)));
if (do_vblank) {
do_or_die(do_wait_for_vblank(o, o->pipe, target_seq,
@@ -1005,7 +1006,7 @@ static void run_test_on_crtc(struct test_output *o, int crtc, int duration)
ellapsed = event_loop(o, duration);
- if (o->flags & TEST_FLIP && !(o->flags & TEST_HANG))
+ if (o->flags & TEST_FLIP && !(o->flags & TEST_NOEVENT))
check_final_state(o, &o->flip_state, ellapsed);
if (o->flags & TEST_VBLANK)
check_final_state(o, &o->vblank_state, ellapsed);
@@ -1108,7 +1109,7 @@ int main(int argc, char **argv)
"flip-vs-wf_vblank" },
{ 15, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK |
TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
- { 15, TEST_FLIP | TEST_MODESET | TEST_HANG , "flip-vs-modeset-vs-hang" },
+ { 15, TEST_FLIP | TEST_MODESET | TEST_HANG | TEST_NOEVENT, "flip-vs-modeset-vs-hang" },
};
int i;
--
1.7.12.4
