tests/kms_color: Rename pipe tests to standard notation
PATCH 1/3 tests/kms_color: Rename pipe tests to standard notation
--- tests/kms_color.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
tests/kms_color.c +13 -13
@@ -855,7 +855,7 @@ run_tests_for_pipe(data_t *data, enum pipe p) data->color_depth =8 ; delta =1.0 / (1 << data->color_depth); - igt_subtest_f("ctm-red-to-blue-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-red-to-blue", kmstest_pipe_name(p)) {color_t blue_green_blue[] = { {0.0 ,0.0 ,1.0 }, {0.0 ,1.0 ,0.0 },
@@ -868,7 +868,7 @@ run_tests_for_pipe(data_t *data, enum pipe p) blue_green_blue, ctm)); } - igt_subtest_f("ctm-green-to-red-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-green-to-red", kmstest_pipe_name(p)) {color_t red_red_blue[] = { {1.0 ,0.0 ,0.0 }, {1.0 ,0.0 ,0.0 },
@@ -881,7 +881,7 @@ run_tests_for_pipe(data_t *data, enum pipe p) red_red_blue, ctm)); } - igt_subtest_f("ctm-blue-to-red-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-blue-to-red", kmstest_pipe_name(p)) {color_t red_green_red[] = { {1.0 ,0.0 ,0.0 }, {0.0 ,1.0 ,0.0 },
@@ -898,7 +898,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)* the it depends on the hardware we're dealing with, we can * either get clamped or rounded values and we also need to * account for odd number of items in the LUTs. */ - igt_subtest_f("ctm-0-25-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-0-25", kmstest_pipe_name(p)) {color_t expected_colors[] = { {0.0 , }, {0.0 , }, {0.0 , } };
@@ -919,7 +919,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)igt_assert (success); } - igt_subtest_f("ctm-0-5-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-0-5", kmstest_pipe_name(p)) {color_t expected_colors[] = { {0.0 , }, {0.0 , }, {0.0 , } };
@@ -940,7 +940,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)igt_assert (success); } - igt_subtest_f("ctm-0-75-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-0-75", kmstest_pipe_name(p)) {color_t expected_colors[] = { {0.0 , }, {0.0 , }, {0.0 , } };
@@ -961,7 +961,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)igt_assert (success); } - igt_subtest_f("ctm-max-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-max", kmstest_pipe_name(p)) {color_t full_rgb[] = { {1.0 ,0.0 ,0.0 }, {0.0 ,1.0 ,0.0 },
@@ -979,7 +979,7 @@ run_tests_for_pipe(data_t *data, enum pipe p) full_rgb, ctm)); } - igt_subtest_f("ctm-negative-pipe%d", p) { + igt_subtest_f("pipe-%s-ctm-negative", kmstest_pipe_name(p)) {color_t all_black[] = { {0.0 ,0.0 ,0.0 }, {0.0 ,0.0 ,0.0 },
@@ -993,20 +993,20 @@ run_tests_for_pipe(data_t *data, enum pipe p) }#if 0 - igt_subtest_f("ctm-limited-range-pipe%d", p) + igt_subtest_f("pipe-%s-ctm-limited-range", kmstest_pipe_name(p))test_pipe_limited_range_ctm (data, primary);#endif - igt_subtest_f("degamma-pipe%d", p) + igt_subtest_f("pipe-%s-degamma", kmstest_pipe_name(p))test_pipe_degamma (data, primary); - igt_subtest_f("gamma-pipe%d", p) + igt_subtest_f("pipe-%s-gamma", kmstest_pipe_name(p))test_pipe_gamma (data, primary); - igt_subtest_f("legacy-gamma-pipe%d", p) + igt_subtest_f("pipe-%s-legacy-gamma", kmstest_pipe_name(p))test_pipe_legacy_gamma (data, primary); - igt_subtest_f("legacy-gamma-reset-pipe%d", p) + igt_subtest_f("pipe-%s-legacy-gamma-reset", kmstest_pipe_name(p))test_pipe_legacy_gamma_reset (data, primary); igt_fixture {
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 tests/kms_flip: Remove blt/rcs flip tests.
With the removal of mmio flips, blt and rcs flips are no longer different from doing busy testing in kms_busy.
--- tests/kms_flip.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-)
tests/kms_flip.c +1 -36
@@ -45,8 +45,7 @@#include "igt_stats.h" #define TEST_DPMS (1 << 0) -#define TEST_WITH_DUMMY_BCS (1 << 1) -#define TEST_WITH_DUMMY_RCS (1 << 2) +#define TEST_PAN (1 << 3)#define TEST_MODESET (1 << 4)#define TEST_CHECK_TS (1 << 5)
@@ -668,8 +667,6 @@ static unsigned int run_test_step(struct test_output *o)struct vblank_reply vbl_reply;unsigned int target_seq;igt_hang_t hang; -igt_spin_t *spin_rcs =0 ; -igt_spin_t *spin_bcs =0 ; target_seq = o->vblank_state.seq_step;/* Absolute waits only works once we have a frame counter. */
@@ -691,20 +688,6 @@ static unsigned int run_test_step(struct test_output *o)if (!(o->flags &TEST_SINGLE_BUFFER )) o->current_fb_id = !o->current_fb_id; -if (o->flags &TEST_WITH_DUMMY_BCS ) { - spin_bcs =igt_spin_batch_new (drm_fd,0 ,I915_EXEC_BLT , - o->fb_info[o->current_fb_id].gem_handle); -igt_spin_batch_set_timeout (spin_bcs, -NSEC_PER_SEC ); - } - -if (o->flags &TEST_WITH_DUMMY_RCS ) { - spin_rcs =igt_spin_batch_new (drm_fd,0 ,I915_EXEC_RENDER , - o->fb_info[o->current_fb_id].gem_handle); -igt_spin_batch_set_timeout (spin_rcs, -NSEC_PER_SEC ); - } -if (o->flags &TEST_FB_RECREATE )recreate_fb (o); new_fb_id = o->fb_ids[o->current_fb_id];
@@ -809,10 +792,6 @@ static unsigned int run_test_step(struct test_output *o) completed_events =EVENT_VBLANK ; } } -if (spin_rcs) -igt_spin_batch_free (drm_fd, spin_rcs); -if (spin_bcs) -igt_spin_batch_free (drm_fd, spin_bcs);if (do_flip && (o->flags &TEST_EBUSY ))igt_assert (do_page_flip (o, new_fb_id, true) == -EBUSY );
@@ -1065,10 +1044,6 @@ static unsigned int wait_for_events(struct test_output *o) evctx.vblank_handler = vblank_handler; evctx.page_flip_handler = page_flip_handler; -/* make timeout lax with the dummy load */ -if (o->flags & (TEST_WITH_DUMMY_BCS |TEST_WITH_DUMMY_RCS )) - timeout.tv_sec *=60 ; -FD_ZERO (&fds);FD_SET (drm_fd, &fds); do {
@@ -1561,15 +1536,7 @@ int main(int argc, char **argv) {30 ,TEST_VBLANK |TEST_VBLANK_BLOCK |TEST_VBLANK_ABSOLUTE , "blocking-absolute-wf_vblank" }, { 60, TEST_VBLANK | TEST_DPMS | TEST_EINVAL, "wf_vblank-vs-dpms" }, - { 60, TEST_VBLANK | TEST_DPMS | TEST_WITH_DUMMY_BCS, - "blt-wf_vblank-vs-dpms" }, - { 60, TEST_VBLANK | TEST_DPMS | TEST_WITH_DUMMY_RCS, - "rcs-wf_vblank-vs-dpms" }, { 60, TEST_VBLANK | TEST_MODESET | TEST_EINVAL, "wf_vblank-vs-modeset" }, - { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_BCS, - "blt-wf_vblank-vs-modeset" }, - { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS, - "rcs-wf_vblank-vs-modeset" }, { 10, TEST_FLIP | TEST_BASIC, "plain-flip" }, { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" },
@@ -1579,8 +1546,6 @@ int main(int argc, char **argv) { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, { 20, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "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" }, { 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ, "flip-vs-expired-vblank" },
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 tests/kms_flip: Move kms_flip.vblank-vs-hang to kms_vblank
In reply to Maarten LankhorstThere's no need to test this more than once.
--- tests/kms_flip.c | 10 +--------- tests/kms_vblank.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 13 deletions(-)
tests/kms_flip.c +1 -9
@@ -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);
@@ -1558,7 +1551,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,
tests/kms_vblank.c +14 -4
@@ -54,6 +54,7 @@ typedef struct {#define IDLE 1#define BUSY 2#define FORKED 4 +#define HANG 8 } data_t; static double elapsed(const struct timespec *start,
@@ -122,6 +123,8 @@ static void run_test(data_t *data, int fd, void (*testfunc)(data_t *, int, int))enum pipe p;for_each_pipe_with_valid_output (display, p, output) { +igt_hang_t hang; + data->pipe = p;prepare_crtc (data, fd, output);
@@ -131,6 +134,9 @@ static void run_test(data_t *data, int fd, void (*testfunc)(data_t *, int, int))igt_output_name (output), nchildren); +if (data->flags &HANG ) + hang =igt_hang_ring (display->drm_fd,I915_EXEC_DEFAULT ); +if (data->flags &BUSY ) {union drm_wait_vblank vbl;
@@ -153,6 +159,9 @@ static void run_test(data_t *data, int fd, void (*testfunc)(data_t *, int, int))igt_assert (poll (&(struct pollfd ){fd,POLLIN },1 ,0 ) ==0 ); +if (data->flags &HANG ) +igt_post_hang_ring (fd, hang); + igt_info("\n%s on pipe %s, connector %s: PASSED\n\n", igt_subtest_name(), kmstest_pipe_name(data->pipe),
@@ -324,9 +333,9 @@ igt_mainvoid (*func)(data_t *,int ,int );unsigned int valid; } funcs[] = { - { "accuracy", accuracy, IDLE }, - { "query", vblank_query, IDLE | FORKED | BUSY }, - { "wait", vblank_wait, IDLE | FORKED | BUSY }, + { "accuracy", accuracy, IDLE | HANG }, + { "query", vblank_query, IDLE | FORKED | BUSY | HANG }, + { "wait", vblank_wait, IDLE | FORKED | BUSY | HANG }, { } }, *f; const struct {
@@ -357,7 +366,8 @@ igt_mainif (m->flags & ~f->valid)continue ; - igt_subtest_f("%s-%s", f->name, m->name) { +igt_subtest_f ("%s-%s%s" , f->name, m->name, + m->flags & HANG ? "-hang" : "") { data.flags = m->flags;run_test (&data, fd, f->func); }
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] tests/kms_color: Rename pipe tests to standard notation
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/3] tests/kms_color: Rename pipe tests to standard notation
URL : https://patchwork.freedesktop.org/series/34287/
State : success
== Summary ==
IGT patchset tested on top of latest successful build a1e444f4c8178acb590d41c21e921c6447668be4 tests/perf_pmu: Bump measuring duration for semaphores as well
with latest DRM-Tip kernel build CI_DRM_3378b407e5f38397 drm-tip: 2017y-11m-23d-16h-14m-59s UTC integration manifest
Testlist changes:
+++ 72 lines
--- 96 lines
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
incomplete -> PASS (fi-cfl-s2)fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:446s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:455s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:389s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:541s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:280s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:516s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:510s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:503s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:501s fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:607s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:268s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:542s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:437s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:445s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:427s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:487s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:466s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:584s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:461s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:541s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:568s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:499s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:461s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:561s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:436s Blacklisted hosts: fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:545s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:481s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:531s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:470s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:533s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_543/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/3] tests/kms_color: Rename pipe tests to standard notation
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/3] tests/kms_color: Rename pipe tests to standard notation
URL : https://patchwork.freedesktop.org/series/34287/
State : success
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
pass -> FAIL (shard-snb) fdo#101623 +1
Test gem_busy:
Subgroup close-race:
pass -> FAIL (shard-snb) fdo#103829
Test drv_module_reload:
Subgroup basic-no-display:
pass -> DMESG-WARN (shard-snb) fdo#102707
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103829 https://bugs.freedesktop.org/show_bug.cgi?id=103829
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2643 pass:1523 dwarn:1 dfail:0 fail:10 skip:1109 time:8783s shard-snb total:2643 pass:1297 dwarn:2 dfail:0 fail:15 skip:1329 time:7400s Blacklisted hosts: shard-apl total:2621 pass:1655 dwarn:2 dfail:0 fail:21 skip:942 time:12635s shard-kbl total:2643 pass:1787 dwarn:6 dfail:0 fail:25 skip:825 time:10123s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_543/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx