diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-11-01 14:20:45 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-01-24 12:01:41 +0100 |
| commit | 4405f3953ccd3ca3f8ac34e0369739f3e91b26de (patch) | |
| tree | 489c5d86bd0cc91ddda6917069716659ec1a41c5 /tests/kms_flip.c | |
| parent | 8d7e9410d41830e99e4cad57f30e92acc4714a3d (diff) | |
tests/kms_flip: Move kms_flip.vblank-vs-hang to kms_vblank, v4.
There's no need to test this more than once. Add a NOHANG
flag which can be used to specify that a subtest can not
be run when hanging. If it's set on either the subtest or
the mode, the -hang test for this combination will not be
generated.
Changes since v1:
- Merge the patch that renamed HANG to NOHANG.
- Rebase after 'reorganize subtests by type'.
- Allow subtests to specify NOHANG too.
Changes since v2:
- Mark accuracy test with NOHANG, gpu reset disables interrupts,
causing the test to fail.
Changes since v3:
- Rebase on top of subtest split changes.
- Add nohang comment to accuracy test. (Daniel)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/kms_flip.c')
| -rw-r--r-- | tests/kms_flip.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 7689e65b..50c16b0d 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -72,7 +72,7 @@ #define TEST_SUSPEND (1 << 26) #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) @@ -1071,13 +1071,8 @@ static unsigned int wait_for_events(struct test_output *o) static unsigned event_loop(struct test_output *o, unsigned duration_ms) { unsigned long start, end; - igt_hang_t hang; int count = 0; - memset(&hang, 0, sizeof(hang)); - if (o->flags & TEST_HANG_ONCE) - hang = hang_gpu(drm_fd); - start = gettime_us(); while (1) { @@ -1097,8 +1092,6 @@ static unsigned event_loop(struct test_output *o, unsigned duration_ms) end = gettime_us(); - unhang_gpu(drm_fd, hang); - /* Flush any remaining events */ if (o->pending_events) wait_for_events(o); @@ -1565,7 +1558,6 @@ int main(int argc, char **argv) TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" }, { 30, TEST_FLIP | TEST_MODESET | TEST_HANG | TEST_NOEVENT, "flip-vs-modeset-vs-hang" }, { 30, TEST_FLIP | TEST_PAN | TEST_HANG, "flip-vs-panning-vs-hang" }, - { 30, TEST_VBLANK | TEST_HANG_ONCE, "vblank-vs-hang" }, { 1, TEST_FLIP | TEST_EINVAL | TEST_FB_BAD_TILING, "flip-vs-bad-tiling" }, { 1, TEST_DPMS_OFF | TEST_MODESET | TEST_FLIP, |