* [igt-dev] [PATCH i-g-t v2 0/2] kms_atomic_transition improvements
@ 2019-03-29 14:07 Stanislav Lisovskiy
2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 1/2] igt/tests/kms_atomic_transition: Skip transition, if no changes done Stanislav Lisovskiy
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Stanislav Lisovskiy @ 2019-03-29 14:07 UTC (permalink / raw)
To: igt-dev; +Cc: ville.syrjala, martin.peres, stanislav.lisovskiy
Fixed run_transition_test issue, which might happen when no changes
are done and wait_transition is called and made setup_parms function
tolerate if kernel can't afford having all sprite planes enabled
depending on current mode.
Stanislav Lisovskiy (2):
igt/tests/kms_atomic_transition: Skip transition, if no changes done
igt/tests: Tolerate if kernel can't have all planes
tests/kms_atomic_transition.c | 53 ++++++++++++++++++++++++++---------
1 file changed, 39 insertions(+), 14 deletions(-)
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread* [igt-dev] [PATCH i-g-t v2 1/2] igt/tests/kms_atomic_transition: Skip transition, if no changes done 2019-03-29 14:07 [igt-dev] [PATCH i-g-t v2 0/2] kms_atomic_transition improvements Stanislav Lisovskiy @ 2019-03-29 14:07 ` Stanislav Lisovskiy 2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 2/2] igt/tests: Tolerate if kernel can't have all planes Stanislav Lisovskiy ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Stanislav Lisovskiy @ 2019-03-29 14:07 UTC (permalink / raw) To: igt-dev; +Cc: ville.syrjala, martin.peres, stanislav.lisovskiy While fixing used amount of planes, discovered that if wm_setup_plane is called with 0 planes(might happen during main testing cycle, as parms[i].mask can be 0 due to randomization) then subsequent wait_transition fails in assertion on fd_completed. So added return value to wm_setup_plane, which would allow to determine, if we need to skip this step. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- tests/kms_atomic_transition.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 18f73317..638fe17e 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -118,11 +118,12 @@ static void configure_fencing(igt_plane_t *plane) igt_assert_eq(ret, 0); } -static void +static int wm_setup_plane(igt_display_t *display, enum pipe pipe, uint32_t mask, struct plane_parms *parms, bool fencing) { igt_plane_t *plane; + int planes_set_up = 0; /* * Make sure these buffers are suited for display use @@ -133,8 +134,10 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe, int i = plane->index; if (!mask || !(parms[i].mask & mask)) { - if (plane->values[IGT_PLANE_FB_ID]) + if (plane->values[IGT_PLANE_FB_ID]) { igt_plane_set_fb(plane, NULL); + planes_set_up++; + } continue; } @@ -144,7 +147,10 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe, igt_plane_set_fb(plane, parms[i].fb); igt_fb_set_size(parms[i].fb, plane, parms[i].width, parms[i].height); igt_plane_set_size(plane, parms[i].width, parms[i].height); + + planes_set_up++; } + return planes_set_up; } static void ev_page_flip(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, void *user_data) @@ -544,7 +550,8 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output igt_output_set_pipe(output, pipe); - wm_setup_plane(display, pipe, i, parms, fencing); + if (!wm_setup_plane(display, pipe, i, parms, fencing)) + continue; atomic_commit(display, pipe, flags, (void *)(unsigned long)i, fencing); wait_for_transition(display, pipe, nonblocking, fencing); @@ -552,7 +559,8 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output if (type == TRANSITION_MODESET_DISABLE) { igt_output_set_pipe(output, PIPE_NONE); - wm_setup_plane(display, pipe, 0, parms, fencing); + if (!wm_setup_plane(display, pipe, 0, parms, fencing)) + continue; atomic_commit(display, pipe, flags, (void *) 0UL, fencing); wait_for_transition(display, pipe, nonblocking, fencing); @@ -568,7 +576,8 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output n_enable_planes < pipe_obj->n_planes) continue; - wm_setup_plane(display, pipe, j, parms, fencing); + if (!wm_setup_plane(display, pipe, j, parms, fencing)) + continue; if (type >= TRANSITION_MODESET) igt_output_override_mode(output, &override_mode); @@ -576,7 +585,9 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output atomic_commit(display, pipe, flags, (void *)(unsigned long) j, fencing); wait_for_transition(display, pipe, nonblocking, fencing); - wm_setup_plane(display, pipe, i, parms, fencing); + if (!wm_setup_plane(display, pipe, i, parms, fencing)) + continue; + if (type >= TRANSITION_MODESET) igt_output_override_mode(output, NULL); -- 2.17.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t v2 2/2] igt/tests: Tolerate if kernel can't have all planes 2019-03-29 14:07 [igt-dev] [PATCH i-g-t v2 0/2] kms_atomic_transition improvements Stanislav Lisovskiy 2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 1/2] igt/tests/kms_atomic_transition: Skip transition, if no changes done Stanislav Lisovskiy @ 2019-03-29 14:07 ` Stanislav Lisovskiy 2019-03-29 14:59 ` [igt-dev] ✓ Fi.CI.BAT: success for kms_atomic_transition improvements (rev2) Patchwork 2019-03-29 17:20 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Stanislav Lisovskiy @ 2019-03-29 14:07 UTC (permalink / raw) To: igt-dev; +Cc: ville.syrjala, martin.peres, stanislav.lisovskiy With some upcoming changes i915 might not allow all sprite planes enabled, depending on available bandwidth limitation. Thus the test need to decrement amount of planes and try again, instead of panicking. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- tests/kms_atomic_transition.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 638fe17e..e4dee7e2 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -214,7 +214,8 @@ static void setup_parms(igt_display_t *display, enum pipe pipe, uint32_t n_planes = display->pipes[pipe].n_planes; uint32_t n_overlays = 0, overlays[n_planes]; igt_plane_t *plane; - uint32_t iter_mask = 3; + uint32_t iter_mask; + int retries = n_planes - 1; do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width)); if (cursor_width >= mode->hdisplay) @@ -224,6 +225,10 @@ static void setup_parms(igt_display_t *display, enum pipe pipe, if (cursor_height >= mode->vdisplay) cursor_height = mode->vdisplay; +retry: + n_overlays = 0; + iter_mask = 3; + for_each_plane_on_pipe(display, pipe, plane) { int i = plane->index; @@ -278,7 +283,6 @@ static void setup_parms(igt_display_t *display, enum pipe pipe, * Pre gen9 not all sizes are supported, find the biggest possible * size that can be enabled on all sprite planes. */ -retry: prev_w = sprite_width = cursor_width; prev_h = sprite_height = cursor_height; @@ -298,12 +302,22 @@ retry: if (is_atomic_check_plane_size_errno(ret)) { if (cursor_width == sprite_width && cursor_height == sprite_height) { - igt_assert_f(alpha, - "Cannot configure the test with all sprite planes enabled\n"); - - /* retry once with XRGB format. */ - alpha = false; - goto retry; + if (--retries >= 0) { + /* retry once with XRGB format. */ + if (alpha) { + alpha = false; + } + else if (display->pipes[pipe].n_planes > 0) { + display->pipes[pipe].n_planes--; + igt_warn("Reduced available planes to %d\n", + display->pipes[pipe].n_planes); + } + n_planes = display->pipes[pipe].n_planes; + igt_assert_f(n_planes > 0, "No planes left to proceed with!"); + goto retry; + } + igt_assert_f(retries > 0, + "Cannot configure the test with all sprite planes enabled\n"); } sprite_width = prev_w; -- 2.17.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for kms_atomic_transition improvements (rev2) 2019-03-29 14:07 [igt-dev] [PATCH i-g-t v2 0/2] kms_atomic_transition improvements Stanislav Lisovskiy 2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 1/2] igt/tests/kms_atomic_transition: Skip transition, if no changes done Stanislav Lisovskiy 2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 2/2] igt/tests: Tolerate if kernel can't have all planes Stanislav Lisovskiy @ 2019-03-29 14:59 ` Patchwork 2019-03-29 17:20 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-03-29 14:59 UTC (permalink / raw) To: Stanislav Lisovskiy; +Cc: igt-dev == Series Details == Series: kms_atomic_transition improvements (rev2) URL : https://patchwork.freedesktop.org/series/58728/ State : success == Summary == CI Bug Log - changes from CI_DRM_5837 -> IGTPW_2738 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/58728/revisions/2/mbox/ Known issues ------------ Here are the changes found in IGTPW_2738 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@amdgpu/amd_basic@cs-compute: - fi-kbl-8809g: NOTRUN -> FAIL [fdo#108094] * igt@gem_exec_store@basic-bsd1: - fi-kbl-r: NOTRUN -> SKIP [fdo#109271] +41 * igt@gem_exec_suspend@basic-s3: - fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718] * igt@kms_chamelium@vga-edid-read: - fi-hsw-4770r: NOTRUN -> SKIP [fdo#109271] +45 * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a: - fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] +1 #### Possible fixes #### * igt@amdgpu/amd_basic@userptr: - fi-kbl-8809g: DMESG-WARN [fdo#108965] -> PASS * igt@i915_selftest@live_uncore: - fi-ivb-3770: DMESG-FAIL [fdo#110210] -> PASS * igt@kms_busy@basic-flip-b: - fi-gdg-551: FAIL [fdo#103182] -> PASS * igt@kms_frontbuffer_tracking@basic: - fi-byt-clapper: FAIL [fdo#103167] -> PASS * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b: - fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS +1 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182 [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191 [fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362 [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#108094]: https://bugs.freedesktop.org/show_bug.cgi?id=108094 [fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#110210]: https://bugs.freedesktop.org/show_bug.cgi?id=110210 Participating hosts (46 -> 41) ------------------------------ Additional (2): fi-hsw-4770r fi-kbl-r Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-bdw-samus Build changes ------------- * IGT: IGT_4912 -> IGTPW_2738 CI_DRM_5837: 1a35af6fa0d612425e325024cbac10e6fa9a9cd5 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_2738: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2738/ IGT_4912: 66deae8b6fa69540f069d6551cd22013f5343948 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2738/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for kms_atomic_transition improvements (rev2) 2019-03-29 14:07 [igt-dev] [PATCH i-g-t v2 0/2] kms_atomic_transition improvements Stanislav Lisovskiy ` (2 preceding siblings ...) 2019-03-29 14:59 ` [igt-dev] ✓ Fi.CI.BAT: success for kms_atomic_transition improvements (rev2) Patchwork @ 2019-03-29 17:20 ` Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-03-29 17:20 UTC (permalink / raw) To: Stanislav Lisovskiy; +Cc: igt-dev == Series Details == Series: kms_atomic_transition improvements (rev2) URL : https://patchwork.freedesktop.org/series/58728/ State : success == Summary == CI Bug Log - changes from CI_DRM_5837_full -> IGTPW_2738_full ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/58728/revisions/2/mbox/ Known issues ------------ Here are the changes found in IGTPW_2738_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_tiled_swapping@non-threaded: - shard-hsw: PASS -> DMESG-WARN [fdo#108686] * igt@kms_atomic_transition@4x-modeset-transitions-nonblocking-fencing: - shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +11 * igt@kms_atomic_transition@plane-all-modeset-transition-fencing: - shard-apl: PASS -> INCOMPLETE [fdo#103927] - shard-kbl: PASS -> INCOMPLETE [fdo#103665] * igt@kms_busy@basic-modeset-e: - shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2 * igt@kms_busy@extended-modeset-hang-newfb-render-a: - shard-hsw: PASS -> DMESG-WARN [fdo#110222] +1 * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a: - shard-snb: PASS -> DMESG-WARN [fdo#110222] - shard-kbl: PASS -> DMESG-WARN [fdo#110222] * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c: - shard-kbl: NOTRUN -> DMESG-WARN [fdo#110222] * igt@kms_cursor_crc@cursor-128x42-offscreen: - shard-hsw: PASS -> INCOMPLETE [fdo#103540] * igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic: - shard-glk: PASS -> FAIL [fdo#102670] * igt@kms_flip@2x-plain-flip-ts-check: - shard-apl: NOTRUN -> SKIP [fdo#109271] +19 * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu: - shard-kbl: PASS -> FAIL [fdo#103167] - shard-apl: PASS -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-render: - shard-snb: NOTRUN -> SKIP [fdo#109271] +69 * igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-pwrite: - shard-glk: NOTRUN -> SKIP [fdo#109271] * igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc: - shard-kbl: NOTRUN -> SKIP [fdo#109271] +30 * igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb: - shard-apl: PASS -> FAIL [fdo#108145] * igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max: - shard-glk: PASS -> FAIL [fdo#108145] * igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping: - shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278] +1 #### Possible fixes #### * igt@gem_eio@hibernate: - shard-snb: FAIL [fdo#107918] -> PASS * igt@gem_pwrite@big-cpu-fbr: - shard-apl: INCOMPLETE [fdo#103927] -> PASS * igt@kms_busy@extended-modeset-hang-newfb-render-b: - shard-kbl: DMESG-WARN [fdo#110222] -> PASS +2 * igt@kms_busy@extended-modeset-hang-newfb-render-c: - shard-hsw: DMESG-WARN [fdo#110222] -> PASS +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a: - shard-glk: DMESG-WARN [fdo#110222] -> PASS * igt@kms_cursor_crc@cursor-128x128-suspend: - shard-kbl: INCOMPLETE [fdo#103665] -> PASS * igt@kms_cursor_crc@cursor-256x256-random: - shard-glk: FAIL [fdo#103232] -> PASS +3 * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy: - shard-hsw: FAIL [fdo#105767] -> PASS * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible: - shard-glk: FAIL [fdo#105363] -> PASS * igt@kms_flip@flip-vs-expired-vblank: - shard-snb: FAIL [fdo#105363] -> PASS * {igt@kms_plane@pixel-format-pipe-b-planes-source-clamping}: - shard-glk: SKIP [fdo#109271] -> PASS * igt@kms_plane_scaling@pipe-b-scaler-with-rotation: - shard-glk: SKIP [fdo#109271] / [fdo#109278] -> PASS * igt@kms_rotation_crc@multiplane-rotation-cropping-top: - shard-kbl: FAIL [fdo#109016] -> PASS * {igt@kms_universal_plane@universal-plane-pipe-c-functional}: - shard-kbl: FAIL [fdo#110037] -> PASS - shard-apl: FAIL [fdo#110037] -> PASS * igt@kms_vblank@pipe-b-ts-continuation-suspend: - shard-kbl: FAIL [fdo#104894] -> PASS - shard-apl: FAIL [fdo#104894] -> PASS {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540 [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665 [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894 [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767 [fdo#107918]: https://bugs.freedesktop.org/show_bug.cgi?id=107918 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686 [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278 [fdo#110037]: https://bugs.freedesktop.org/show_bug.cgi?id=110037 [fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222 Participating hosts (10 -> 5) ------------------------------ Missing (5): shard-skl pig-hsw-4770r pig-glk-j5005 shard-iclb pig-skl-6260u Build changes ------------- * IGT: IGT_4912 -> IGTPW_2738 * Piglit: piglit_4509 -> None CI_DRM_5837: 1a35af6fa0d612425e325024cbac10e6fa9a9cd5 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_2738: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2738/ IGT_4912: 66deae8b6fa69540f069d6551cd22013f5343948 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2738/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-29 17:20 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-03-29 14:07 [igt-dev] [PATCH i-g-t v2 0/2] kms_atomic_transition improvements Stanislav Lisovskiy 2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 1/2] igt/tests/kms_atomic_transition: Skip transition, if no changes done Stanislav Lisovskiy 2019-03-29 14:07 ` [igt-dev] [PATCH i-g-t v2 2/2] igt/tests: Tolerate if kernel can't have all planes Stanislav Lisovskiy 2019-03-29 14:59 ` [igt-dev] ✓ Fi.CI.BAT: success for kms_atomic_transition improvements (rev2) Patchwork 2019-03-29 17:20 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox