flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-10 09:26:10 +00:00
Code Issues Releases Wiki Activity

kms_flip: Split the "no events" logic into a separate flag

Browse Source 
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@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2013-02-15 17:10:46 +02:00 committed by Daniel Vetter
parent c6c6f0f593
commit 1f5957c64e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/kms_flip.c
View File

@ -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;