From 1f5957c64ea5c28d785e60e36adaf2a507665b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 15 Feb 2013 17:10:46 +0200 Subject: [PATCH] kms_flip: Split the "no events" logic into a separate flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Signed-off-by: Daniel Vetter --- 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 1de61542..37a6a0ea 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -59,6 +59,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) @@ -647,7 +648,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, @@ -1007,7 +1008,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); @@ -1110,7 +1111,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;