[PATCH 16/18] tests/kms_flip: add basic tests for flip, flip vs dpms, and flip modeset

Jesse Barnes
2015-08-13T20:54:27Z

Simple variants that don't do multiple output or interruptible testing.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
tests/kms_flip.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index a595d9f..a0e4112 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -80,6 +80,7 @@
#define TEST_TS_CONT (1 << 27)
#define TEST_BO_TOOBIG (1 << 28)
#define TEST_HANG_ONCE (1 << 29)
+#define TEST_BASIC (1 << 30)

#define EVENT_FLIP (1 << 0)
#define EVENT_VBLANK (1 << 1)
@@ -1649,7 +1650,7 @@ int main(int argc, char **argv)
"blt-wf_vblank-vs-modeset" },
{ 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS,
"rcs-wf_vblank-vs-modeset" },
-
+ { 30, TEST_FLIP | TEST_BASIC, "basic-plain-flip" },
{ 30, TEST_FLIP , "plain-flip" },
{ 30, TEST_FLIP | TEST_EBUSY , "busy-flip" },
{ 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" },
@@ -1657,12 +1658,14 @@ int main(int argc, char **argv)
{ 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE,
"plain-flip-fb-recreate" },
{ 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" },
+ { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "basic-flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" },
{ 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" },
{ 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" },
{ 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" },
+ { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "basic-flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL, "flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" },
@@ -1721,6 +1724,9 @@ int main(int argc, char **argv)
igt_subtest(tests[i].name)
run_test(tests[i].duration, tests[i].flags);

+ if (tests[i].flags & TEST_BASIC)
+ continue;
+
if (tests[i].flags & TEST_NO_2X_OUTPUT)
continue;

@@ -1740,6 +1746,9 @@ int main(int argc, char **argv)
!(tests[i].flags & TEST_VBLANK_ABSOLUTE))
continue;

+ if (tests[i].flags & TEST_BASIC)
+ continue;
+
igt_subtest_f( "%s-interruptible", tests[i].name)
run_test(tests[i].duration, tests[i].flags);

--
1.9.1