kms_flip: Shorten basic tests a bit
PATCH 1/2 kms_flip: Shorten basic tests a bit
From: Tvrtko Ursulin <[email protected]>
Seems like an overkill for a basic test to keep flipping for a full minute. Dial it down a bit.
--- tests/kms_flip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_flip.c +4 -4
@@ -1626,20 +1626,20 @@ 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, "plain-flip" }, + { 10, TEST_FLIP | TEST_BASIC, "plain-flip" }, { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, { 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_RMFB | TEST_MODESET , "flip-vs-rmfb" }, - { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" }, + { 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" }, - { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" }, + { 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,
@@ -1647,7 +1647,7 @@ int main(int argc, char **argv) {30 ,TEST_FLIP |TEST_VBLANK |TEST_VBLANK_ABSOLUTE | TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" }, - { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, + { 10, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, "flip-vs-wf_vblank" }, { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK | TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 kms_flip: Run basic tests only on one pipe
From: Tvrtko Ursulin <[email protected]>
It brings enough value for the basic test set to check one connector with one pipe only, rather every connector with all possible pipes.
--- tests/kms_flip.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tests/kms_flip.c +14 -4
@@ -1283,7 +1283,7 @@ static void free_test_output(struct test_output *o) } } -static void run_test_on_crtc_set (struct test_output *o,int *crtc_idxs, +static bool run_test_on_crtc_set (struct test_output *o,int *crtc_idxs,int crtc_count,int duration_ms) {char test_name[128 ];
@@ -1296,7 +1296,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,case 1 :connector_find_preferred_mode (o->_connector[0 ], crtc_idxs[0 ], o);if (!o->mode_valid) -return ; +return false; snprintf(test_name, sizeof(test_name), "%s on pipe %s, connector %s-%d", igt_subtest_name(),
@@ -1307,7 +1307,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,case 2 :connector_find_compatible_mode (crtc_idxs[0 ], crtc_idxs[1 ], o);if (!o->mode_valid) -return ; +return false; snprintf(test_name, sizeof(test_name), "%s on pipe %s:%s, connector %s-%d:%s-%d", igt_subtest_name(),
@@ -1422,6 +1422,8 @@ out: last_connector =NULL ;free_test_output (o); + +return true; }static int run_test (int duration,int flags)
@@ -1454,6 +1456,9 @@ static int run_test(int duration, int flags) modes++;free_test_output (&o); + +if ((flags &TEST_BASIC ) && modes >0 ) +break ; } }
@@ -1462,6 +1467,7 @@ static int run_test(int duration, int flags) duration =max (500 , duration);/* Find any connected displays */ + modes =0 ;for (i =0 ; i < resources->count_connectors; i++) {for (n =0 ; n < resources->count_crtcs; n++) {int crtc_idx;
@@ -1476,7 +1482,11 @@ static int run_test(int duration, int flags) o.depth =24 ; crtc_idx = n; -run_test_on_crtc_set (&o, &crtc_idx,1 , duration); +if (run_test_on_crtc_set (&o, &crtc_idx,1 , duration)) + modes++; + +if ((flags &TEST_BASIC ) && modes >0 ) +break ; } }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
It brings enough value for the basic test set to check one connector with one pipe only, rather every connector with all possible pipes.
Signed-off-by Tvrtko Ursulin <[email protected]>
Unfortuantely we've broken this a few too many times. I kid you not, but before this testcase page_flip tended to indeed only work on pipe A. Also vlv/chv have hilarious "this output only works on pipe C" restrictions.
I think at least one pageflip+vblank ts testcase must run on all pipes to have full coverage. The others we could reduce indeed.
Quoted 82 lines
--- tests/kms_flip.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)tests/kms_flip.c +14
-4@@ -1283,7 +1283,7 @@ static void free_test_output(struct test_output *o) } } -static void run_test_on_crtc_set (struct test_output *o,int *crtc_idxs, +static bool run_test_on_crtc_set (struct test_output *o,int *crtc_idxs,int crtc_count,int duration_ms) {char test_name[128 ];@@ -1296,7 +1296,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,case 1 :connector_find_preferred_mode (o->_connector[0 ], crtc_idxs[0 ], o);if (!o->mode_valid) -return ; +return false; snprintf(test_name, sizeof(test_name), "%s on pipe %s, connector %s-%d", igt_subtest_name(),@@ -1307,7 +1307,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,case 2 :connector_find_compatible_mode (crtc_idxs[0 ], crtc_idxs[1 ], o);if (!o->mode_valid) -return ; +return false; snprintf(test_name, sizeof(test_name), "%s on pipe %s:%s, connector %s-%d:%s-%d", igt_subtest_name(),@@ -1422,6 +1422,8 @@ out: last_connector =NULL ;free_test_output (o); + +return true; }static int run_test (int duration,int flags)@@ -1454,6 +1456,9 @@ static int run_test(int duration, int flags) modes++;free_test_output (&o); + +if ((flags &TEST_BASIC ) && modes >0 ) +break ; } }@@ -1462,6 +1467,7 @@ static int run_test(int duration, int flags) duration =max (500 , duration);/* Find any connected displays */ + modes =0 ;for (i =0 ; i < resources->count_connectors; i++) {for (n =0 ; n < resources->count_crtcs; n++) {int crtc_idx;@@ -1476,7 +1482,11 @@ static int run_test(int duration, int flags) o.depth =24 ; crtc_idx = n; -run_test_on_crtc_set (&o, &crtc_idx,1 , duration); +if (run_test_on_crtc_set (&o, &crtc_idx,1 , duration)) + modes++; + +if ((flags &TEST_BASIC ) && modes >0 ) +break ; } }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Seems like an overkill for a basic test to keep flipping for a full minute. Dial it down a bit.
Signed-off-by Tvrtko Ursulin <[email protected]>
Ack.
-Daniel
Quoted 48 lines
--- tests/kms_flip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tests/kms_flip.c +4
-4@@ -1626,20 +1626,20 @@ 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, "plain-flip" }, + { 10, TEST_FLIP | TEST_BASIC, "plain-flip" }, { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, { 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_RMFB | TEST_MODESET , "flip-vs-rmfb" }, - { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" }, + { 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" }, - { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" }, + { 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,@@ -1647,7 +1647,7 @@ int main(int argc, char **argv) {30 ,TEST_FLIP |TEST_VBLANK |TEST_VBLANK_ABSOLUTE | TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" }, - { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, + { 10, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, "flip-vs-wf_vblank" }, { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK | TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thanks. Pushed.
Quoted 54 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Seems like an overkill for a basic test to keep flipping for a full minute. Dial it down a bit.
Signed-off-by Tvrtko Ursulin <[email protected]>--- tests/kms_flip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tests/kms_flip.c +4
-4@@ -1626,20 +1626,20 @@ 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, "plain-flip" }, + { 10, TEST_FLIP | TEST_BASIC, "plain-flip" }, { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, { 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_RMFB | TEST_MODESET , "flip-vs-rmfb" }, - { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" }, + { 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" }, - { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" }, + { 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,@@ -1647,7 +1647,7 @@ int main(int argc, char **argv) {30 ,TEST_FLIP |TEST_VBLANK |TEST_VBLANK_ABSOLUTE | TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" }, - { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, + { 10, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, "flip-vs-wf_vblank" }, { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK | TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx