* [igt-dev] [PATCH v1] igt/tests: Fix kms_concurrent from skipping @ 2019-04-16 8:18 Stanislav Lisovskiy 2019-04-16 9:10 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork 2019-04-16 10:45 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 0 siblings, 2 replies; 3+ messages in thread From: Stanislav Lisovskiy @ 2019-04-16 8:18 UTC (permalink / raw) To: igt-dev Cc: ville.syrjala, martin.peres, stanislav.lisovskiy, juha-pekka.heikkila From: "Lisovskiy, Stanislav" <stanislav.lisovskiy@intel.com> With current resource/bw limitation paradigm, we should not skip the whole test case, if we could not make use of a single pipe. Now skipping only if all pipes were unusable with current configuration. Change-Id: I7677e3e80c74e8b7303fb4edb4aba926afbedb49 Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- tests/kms_concurrent.c | 54 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c index d82ca040..7e833846 100644 --- a/tests/kms_concurrent.c +++ b/tests/kms_concurrent.c @@ -54,12 +54,17 @@ struct { /* * Common code across all tests, acting on data_t */ -static void test_init(data_t *data, enum pipe pipe, int n_planes, +static int test_init(data_t *data, enum pipe pipe, int n_planes, igt_output_t *output) { drmModeModeInfo *mode; igt_plane_t *primary; int ret; + uint64_t cursor_width, cursor_height; + uint64_t plane_width, plane_height; + + do_or_die(drmGetCap(data->display.drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width)); + do_or_die(drmGetCap(data->display.drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height)); data->plane = calloc(n_planes, sizeof(*data->plane)); igt_assert_f(data->plane != NULL, "Failed to allocate memory for planes\n"); @@ -74,7 +79,10 @@ static void test_init(data_t *data, enum pipe pipe, int n_planes, mode = igt_output_get_mode(output); - igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, + plane_width = mode->hdisplay; + plane_height = mode->vdisplay; + + igt_create_color_fb(data->drm_fd, plane_width, plane_height, DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, 0.0f, 0.0f, 1.0f, @@ -82,8 +90,38 @@ static void test_init(data_t *data, enum pipe pipe, int n_planes, igt_plane_set_fb(data->plane[primary->index], &data->fb[primary->index]); - ret = igt_display_try_commit2(&data->display, COMMIT_ATOMIC); - igt_skip_on(ret != 0); + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); + + while (ret) { + if (plane_width <= cursor_width) + break; + + if (plane_height <= cursor_height) + break; + + igt_remove_fb(data->display.drm_fd, &data->fb[primary->index]); + plane_width /= 2; + plane_height /= 2; + + igt_create_color_fb(data->drm_fd, plane_width, plane_height, + DRM_FORMAT_XRGB8888, + LOCAL_I915_FORMAT_MOD_X_TILED, + 0.0f, 0.0f, 1.0f, + &data->fb[primary->index]); + + igt_plane_set_fb(data->plane[primary->index], &data->fb[primary->index]); + igt_plane_set_size(data->plane[primary->index], plane_width, plane_height); + + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY, NULL); + } + if (ret) { + igt_plane_set_fb(data->plane[primary->index], NULL); + igt_remove_fb(data->display.drm_fd, &data->fb[primary->index]); + igt_output_set_pipe(output, PIPE_NONE); + } else { + ret = igt_display_try_commit2(&data->display, COMMIT_ATOMIC); + } + return ret; } static void test_fini(data_t *data, enum pipe pipe, int n_planes, @@ -315,7 +353,13 @@ run_test(data_t *data, enum pipe pipe, igt_output_t *output) igt_info("Testing resolution with connector %s using pipe %s with seed %d\n", igt_output_name(output), kmstest_pipe_name(pipe), opt.seed); - test_init(data, pipe, n_planes, output); + /* + * If we can't use one pipe due to hardware limitations + * let's just continue, skip only if none of the pipes were + * usable at all. + */ + if (test_init(data, pipe, n_planes, output)) + continue; igt_fork(child, 1) { test_plane_position_with_output(data, pipe, output); -- 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] 3+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for igt/tests: Fix kms_concurrent from skipping 2019-04-16 8:18 [igt-dev] [PATCH v1] igt/tests: Fix kms_concurrent from skipping Stanislav Lisovskiy @ 2019-04-16 9:10 ` Patchwork 2019-04-16 10:45 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2019-04-16 9:10 UTC (permalink / raw) To: Lisovskiy, Stanislav; +Cc: igt-dev == Series Details == Series: igt/tests: Fix kms_concurrent from skipping URL : https://patchwork.freedesktop.org/series/59561/ State : success == Summary == CI Bug Log - changes from IGT_4949 -> IGTPW_2861 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/59561/revisions/1/mbox/ Known issues ------------ Here are the changes found in IGTPW_2861 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@amdgpu/amd_basic@userptr: - fi-whl-u: NOTRUN -> SKIP [fdo#109271] +41 * igt@amdgpu/amd_cs_nop@fork-compute0: - fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] +18 * igt@i915_selftest@live_contexts: - fi-skl-gvtdvm: PASS -> DMESG-FAIL [fdo#110235 ] * igt@i915_selftest@live_execlists: - fi-apl-guc: PASS -> INCOMPLETE [fdo#103927] / [fdo#109720] * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a: - fi-whl-u: NOTRUN -> FAIL [fdo#103375] +1 * igt@kms_psr@cursor_plane_move: - fi-whl-u: NOTRUN -> FAIL [fdo#107383] +3 #### Possible fixes #### * igt@i915_module_load@reload: - fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS * igt@i915_selftest@live_contexts: - fi-bdw-gvtdvm: DMESG-FAIL [fdo#110235 ] -> PASS * igt@kms_frontbuffer_tracking@basic: - fi-icl-u3: FAIL [fdo#103167] -> PASS [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375 [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383 [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720 [fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235 Participating hosts (49 -> 44) ------------------------------ Additional (1): fi-whl-u Missing (6): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus Build changes ------------- * IGT: IGT_4949 -> IGTPW_2861 CI_DRM_5936: 0ad14bd30d830a1a355040b29bfafbe6623d84f0 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_2861: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2861/ IGT_4949: 2bd82477a9ee6aa308e0f1045df4901f766683ea @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2861/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 3+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for igt/tests: Fix kms_concurrent from skipping 2019-04-16 8:18 [igt-dev] [PATCH v1] igt/tests: Fix kms_concurrent from skipping Stanislav Lisovskiy 2019-04-16 9:10 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork @ 2019-04-16 10:45 ` Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2019-04-16 10:45 UTC (permalink / raw) To: Lisovskiy, Stanislav; +Cc: igt-dev == Series Details == Series: igt/tests: Fix kms_concurrent from skipping URL : https://patchwork.freedesktop.org/series/59561/ State : success == Summary == CI Bug Log - changes from IGT_4949_full -> IGTPW_2861_full ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/59561/revisions/1/mbox/ Known issues ------------ Here are the changes found in IGTPW_2861_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_mocs_settings@mocs-reset-bsd1: - shard-iclb: NOTRUN -> SKIP [fdo#109276] +2 * igt@gen3_render_mixed_blits: - shard-hsw: NOTRUN -> SKIP [fdo#109271] +23 * igt@i915_pm_lpsp@edp-native: - shard-iclb: NOTRUN -> SKIP [fdo#109301] * igt@i915_pm_rpm@dpms-lpsp: - shard-kbl: NOTRUN -> SKIP [fdo#109271] +11 * igt@i915_pm_rpm@modeset-non-lpsp-stress: - shard-iclb: NOTRUN -> SKIP [fdo#109308] * igt@i915_suspend@debugfs-reader: - shard-apl: PASS -> DMESG-WARN [fdo#108566] +3 * igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing: - shard-apl: PASS -> FAIL [fdo#109660] * igt@kms_busy@extended-pageflip-hang-newfb-render-d: - shard-hsw: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1 * igt@kms_chamelium@hdmi-cmp-planes-random: - shard-iclb: NOTRUN -> SKIP [fdo#109284] * igt@kms_content_protection@legacy: - shard-apl: NOTRUN -> FAIL [fdo#110321] / [fdo#110336] * igt@kms_cursor_crc@cursor-512x512-suspend: - shard-iclb: NOTRUN -> SKIP [fdo#109279] * igt@kms_cursor_legacy@cursora-vs-flipb-varying-size: - shard-iclb: NOTRUN -> SKIP [fdo#109274] +2 * igt@kms_flip@plain-flip-fb-recreate-interruptible: - shard-hsw: PASS -> INCOMPLETE [fdo#103540] * igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite: - shard-iclb: PASS -> FAIL [fdo#103167] +4 * igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-gtt: - shard-iclb: NOTRUN -> SKIP [fdo#109280] +5 * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-pwrite: - shard-iclb: PASS -> FAIL [fdo#109247] +17 * igt@kms_frontbuffer_tracking@psr-slowdraw: - shard-apl: NOTRUN -> SKIP [fdo#109271] +91 * igt@kms_pipe_crc_basic@read-crc-pipe-f: - shard-iclb: NOTRUN -> SKIP [fdo#109278] +4 * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-f: - shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +5 * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max: - shard-apl: NOTRUN -> FAIL [fdo#108145] * igt@kms_psr@primary_mmap_cpu: - shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215] * igt@kms_psr@psr2_primary_mmap_cpu: - shard-iclb: PASS -> SKIP [fdo#109441] +2 * igt@kms_rotation_crc@multiplane-rotation: - shard-kbl: PASS -> FAIL [fdo#109016] * igt@kms_universal_plane@disable-primary-vs-flip-pipe-e: - shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1 * igt@tools_test@tools_test: - shard-snb: PASS -> SKIP [fdo#109271] * igt@v3d_get_bo_offset@get-bad-handle: - shard-iclb: NOTRUN -> SKIP [fdo#109315] #### Possible fixes #### * igt@gem_exec_reloc@basic-write-read: - shard-iclb: INCOMPLETE -> PASS * igt@gem_workarounds@suspend-resume: - shard-apl: DMESG-WARN [fdo#108566] -> PASS +8 * igt@i915_selftest@live_workarounds: - shard-iclb: DMESG-FAIL [fdo#108954] -> PASS * igt@kms_flip@nonexisting-fb-interruptible: - shard-kbl: SKIP [fdo#109271] -> PASS * igt@kms_frontbuffer_tracking@fbc-tilingchange: - shard-iclb: FAIL [fdo#103167] -> PASS +8 * igt@kms_frontbuffer_tracking@fbcpsr-1p-rte: - shard-iclb: FAIL [fdo#103167] / [fdo#110378] -> PASS * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen: - shard-iclb: FAIL [fdo#109247] -> PASS +12 * igt@kms_psr@primary_render: - shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS * igt@kms_psr@psr2_sprite_plane_move: - shard-iclb: SKIP [fdo#109441] -> PASS +2 * igt@kms_sysfs_edid_timing: - shard-iclb: FAIL [fdo#100047] -> PASS * igt@testdisplay: - shard-kbl: INCOMPLETE [fdo#103665] -> PASS - shard-apl: INCOMPLETE [fdo#103927] -> PASS [fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [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#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#108954]: https://bugs.freedesktop.org/show_bug.cgi?id=108954 [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016 [fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274 [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278 [fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279 [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280 [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284 [fdo#109301]: https://bugs.freedesktop.org/show_bug.cgi?id=109301 [fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308 [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109660]: https://bugs.freedesktop.org/show_bug.cgi?id=109660 [fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215 [fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321 [fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336 [fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378 Participating hosts (7 -> 6) ------------------------------ Missing (1): shard-skl Build changes ------------- * IGT: IGT_4949 -> IGTPW_2861 CI_DRM_5936: 0ad14bd30d830a1a355040b29bfafbe6623d84f0 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_2861: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2861/ IGT_4949: 2bd82477a9ee6aa308e0f1045df4901f766683ea @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2861/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-16 10:45 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-04-16 8:18 [igt-dev] [PATCH v1] igt/tests: Fix kms_concurrent from skipping Stanislav Lisovskiy 2019-04-16 9:10 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork 2019-04-16 10:45 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.