diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-05-28 20:05:59 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-06-04 20:16:01 +0300 |
| commit | 11e62a3927e415f88dae3519578d9bba8def3128 (patch) | |
| tree | 7653d163efffdaf5a01bdb8fd7b16fda5d912944 | |
| parent | ddf92db9147375a4d0fc3ee861519bc1d6b0214b (diff) | |
tests/kms_flip: Move EBUSY to a new busy-flip subtest
The EBUSY checking is very fragile currently in case there's any kind
extra delay in the test loop. At least the flip-vs-rmfb fails reliably
on my IVB.
So to make the test less fragile remove the EBUSY check from all the
current flip tests, and instead add a specific busy-flip test. To
better guarantee that we get the EBUSY add a blocking vblank wait just
before we issue the first flip. This maximizes the time we have to
submit two flips during one frame.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
| -rw-r--r-- | tests/kms_flip.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 6711f095..46ce2ed1 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -894,6 +894,12 @@ static unsigned int run_test_step(struct test_output *o) igt_assert_f(hang, "failed to exercise page flip hang recovery\n"); } + /* try to make sure we can issue two flips during the same frame */ + if (do_flip && (o->flags & TEST_EBUSY)) { + struct vblank_reply reply; + igt_assert(__wait_for_vblank(TEST_VBLANK_BLOCK, o->pipe, 1, 0, &reply) == 0); + } + if (do_flip) do_or_die(do_page_flip(o, new_fb_id, !(o->flags & TEST_NOEVENT))); @@ -1536,12 +1542,13 @@ int main(int argc, char **argv) { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS, "rcs-wf_vblank-vs-modeset" }, - { 30, TEST_FLIP | TEST_EBUSY , "plain-flip" }, + { 30, TEST_FLIP , "plain-flip" }, + { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, - { 30, TEST_FLIP | TEST_CHECK_TS | TEST_EBUSY , "plain-flip-ts-check" }, - { 30, TEST_FLIP | TEST_CHECK_TS | TEST_EBUSY | TEST_FB_RECREATE, + { 30, TEST_FLIP | TEST_CHECK_TS, "plain-flip-ts-check" }, + { 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE, "plain-flip-fb-recreate" }, - { 30, TEST_FLIP | TEST_EBUSY | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, + { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "bcs-flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "rcs-flip-vs-dpms" }, |