diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-08-09 11:11:52 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-08-14 14:45:04 +0200 |
| commit | b0081ea9cb7d39234fd0fcc64dd56ed4f5d50b05 (patch) | |
| tree | 1fcd039f7d4b14979728fa803284535f46b9f9cc /tests/kms_flip.c | |
| parent | dd0c75c1e5eeeee324005ad1ebfd5a5d24cef6fb (diff) | |
tests/kms_flip: Remove $engine-flip-vs-dpms/modeset
This is already tested in kms_busy, and without cs flips there's no
point in doing those tests any more.
The removed tests were broken and caused GPU hangs because the spin
batch was not unblocked correctly.
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 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index ede5fd2b..ea860e19 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -755,13 +755,8 @@ static unsigned int run_test_step(struct test_output *o) if (o->flags & TEST_MODESET) igt_assert(set_mode(o, o->fb_ids[o->current_fb_id], 0, 0) == 0); - if (o->flags & TEST_DPMS) { - if (spin_rcs) - igt_spin_batch_set_timeout(spin_rcs, NSEC_PER_SEC); - if (spin_bcs) - igt_spin_batch_set_timeout(spin_bcs, NSEC_PER_SEC); + if (o->flags & TEST_DPMS) set_dpms(o, DRM_MODE_DPMS_ON); - } if (o->flags & TEST_VBLANK_RACE) { struct vblank_reply reply; @@ -1592,14 +1587,10 @@ int main(int argc, char **argv) "plain-flip-fb-recreate" }, { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, { 20, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "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" }, { 20, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "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" }, { 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ, "flip-vs-expired-vblank" }, |