* [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time
@ 2021-01-05 11:08 Nidhi Gupta
2021-01-05 11:53 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_atomic_transition:reduce execution time (rev6) Patchwork
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Nidhi Gupta @ 2021-01-05 11:08 UTC (permalink / raw)
To: igt-dev; +Cc: Nidhi Gupta
v1: All the subtests are using for_each_pipe_with_valid_output
function which will execute on all the possible
combination of pipe and output to reduce the execution
time replaced the function with
for_each_pipe_with_single_output this will loop over all
the pipes but at most once.
v2: kms_atomic_transition test is taking minimum of
69.5s time to execute on CI. To reduce the execution
time this patch will add the change which will run
the test on 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane
and skip the rest of the planes.
v3: combined v1 and v2 in one patch.
v4: -restricted execution of all the subtests to
2 pipes. (Uma)
-Modified skip_plane() function. (Uma)
v5: -added a extended flag, if it is set but the user
test will be executed on all the pipes otherwise will be
executed only on 2 pipes. (Karthik)
Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com>
---
tests/kms_atomic_transition.c | 136 +++++++++++++++++++++++++++-------
1 file changed, 110 insertions(+), 26 deletions(-)
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 02206f0a..1d0faa67 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -50,6 +50,10 @@ int *timeline;
pthread_t *thread;
int *seqno;
+typedef struct {
+ bool extended;
+} data_t;
+
static void
run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
{
@@ -120,8 +124,35 @@ static void configure_fencing(igt_plane_t *plane)
igt_assert_eq(ret, 0);
}
+static bool skip_plane(igt_display_t *display, data_t *data, igt_plane_t *plane)
+{
+ int index = plane->index;
+
+ if (data->extended)
+ return false;
+
+ if (!is_i915_device(display->drm_fd))
+ return false;
+
+ if (plane->type == DRM_PLANE_TYPE_CURSOR)
+ return false;
+
+ if (intel_gen(intel_get_drm_devid(display->drm_fd)) < 11)
+ return false;
+
+ /*
+ * Test 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane.
+ *
+ * Kernel registers planes in the hardware Z order:
+ * 0,1,2 HDR planes
+ * 3,4 SDR UV planes
+ * 5,6 SDR Y planes
+ */
+ return index != 0 && index != 3 && index != 5;
+}
+
static int
-wm_setup_plane(igt_display_t *display, enum pipe pipe,
+wm_setup_plane(igt_display_t *display, data_t *data, enum pipe pipe,
uint32_t mask, struct plane_parms *parms, bool fencing)
{
igt_plane_t *plane;
@@ -135,6 +166,9 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
for_each_plane_on_pipe(display, pipe, plane) {
int i = plane->index;
+ if (skip_plane(display, data, plane))
+ continue;
+
if (!mask || !(parms[i].mask & mask)) {
if (plane->values[IGT_PLANE_FB_ID]) {
igt_plane_set_fb(plane, NULL);
@@ -205,7 +239,8 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
#define is_atomic_check_plane_size_errno(errno) \
(errno == -EINVAL)
-static void setup_parms(igt_display_t *display, enum pipe pipe,
+static void setup_parms(igt_display_t *display, data_t *data,
+ enum pipe pipe,
const drmModeModeInfo *mode,
struct igt_fb *primary_fb,
struct igt_fb *argb_fb,
@@ -298,7 +333,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
set_sprite_wh(display, pipe, parms, sprite_fb,
alpha, sprite_width, sprite_height);
- wm_setup_plane(display, pipe, (1 << n_planes) - 1, parms, false);
+ wm_setup_plane(display, data, pipe, (1 << n_planes) - 1, parms, false);
ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
igt_assert(!is_atomic_check_failure_errno(ret));
@@ -437,7 +472,7 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
* so test this and make sure it works.
*/
static void
-run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output,
+run_transition_test(igt_display_t *display, data_t *data, enum pipe pipe, igt_output_t *output,
enum transition_type type, bool nonblocking, bool fencing)
{
struct igt_fb fb, argb_fb, sprite_fb;
@@ -470,7 +505,7 @@ 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, 0, NULL, false);
+ wm_setup_plane(display, data, pipe, 0, NULL, false);
if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
igt_output_set_pipe(output, PIPE_NONE);
@@ -482,7 +517,7 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
igt_display_commit2(display, COMMIT_ATOMIC);
- setup_parms(display, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);
+ setup_parms(display, data, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);
/*
* In some configurations the tests may not run to completion with all
@@ -490,7 +525,7 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
* planes to fix this
*/
while (1) {
- wm_setup_plane(display, pipe, iter_max - 1, parms, false);
+ wm_setup_plane(display, data, pipe, iter_max - 1, parms, false);
if (fencing)
igt_pipe_request_out_fence(pipe_obj);
@@ -524,7 +559,7 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
if (type == TRANSITION_AFTER_FREE) {
int fence_fd = -1;
- wm_setup_plane(display, pipe, 0, parms, fencing);
+ wm_setup_plane(display, data, pipe, 0, parms, fencing);
atomic_commit(display, pipe, flags, (void *)(unsigned long)0, fencing);
if (fencing) {
@@ -560,7 +595,7 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
igt_output_set_pipe(output, pipe);
- if (!wm_setup_plane(display, pipe, i, parms, fencing))
+ if (!wm_setup_plane(display, data, pipe, i, parms, fencing))
continue;
atomic_commit(display, pipe, flags, (void *)(unsigned long)i, fencing);
@@ -569,7 +604,7 @@ 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);
- if (!wm_setup_plane(display, pipe, 0, parms, fencing))
+ if (!wm_setup_plane(display, data, pipe, 0, parms, fencing))
continue;
atomic_commit(display, pipe, flags, (void *) 0UL, fencing);
@@ -586,7 +621,7 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
n_enable_planes < pipe_obj->n_planes)
continue;
- if (!wm_setup_plane(display, pipe, j, parms, fencing))
+ if (!wm_setup_plane(display, data, pipe, j, parms, fencing))
continue;
if (type >= TRANSITION_MODESET)
@@ -595,7 +630,7 @@ 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);
- if (!wm_setup_plane(display, pipe, i, parms, fencing))
+ if (!wm_setup_plane(display, data, pipe, i, parms, fencing))
continue;
if (type >= TRANSITION_MODESET)
@@ -913,7 +948,30 @@ static bool output_is_internal_panel(igt_output_t *output)
}
}
-igt_main
+static int opt_handler(int opt, int opt_index, void *_data)
+{
+ data_t *data = _data;
+
+ switch (opt) {
+ case 'e':
+ data->extended = true;
+ break;
+ }
+
+ return IGT_OPT_HANDLER_SUCCESS;
+}
+
+static const struct option long_opts[] = {
+ { .name = "extended", .has_arg = false, .val = 'e', },
+ {}
+};
+
+static const char help_str[] =
+ " --extended\t\tRun the extended tests\n";
+
+static data_t data;
+
+igt_main_args("", long_opts, help_str, opt_handler, &data)
{
igt_display_t display;
igt_output_t *output;
@@ -935,48 +993,63 @@ igt_main
}
igt_subtest("plane-primary-toggle-with-vblank-wait")
- for_each_pipe_with_valid_output(&display, pipe, output)
+ for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
run_primary_test(&display, pipe, output);
+ }
igt_subtest_with_dynamic("plane-all-transition") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, false);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_PLANES, false, false);
}
}
igt_subtest_with_dynamic("plane-all-transition-fencing") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, true);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_PLANES, false, true);
}
}
igt_subtest_with_dynamic("plane-all-transition-nonblocking") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, true, false);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_PLANES, true, false);
}
}
igt_subtest_with_dynamic("plane-all-transition-nonblocking-fencing") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, true, true);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_PLANES, true, true);
}
}
igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_AFTER_FREE, true, false);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_AFTER_FREE, true, false);
}
}
igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind-fencing") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_AFTER_FREE, true, true);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_AFTER_FREE, true, true);
}
}
@@ -987,45 +1060,56 @@ igt_main
*/
igt_subtest_with_dynamic("plane-all-modeset-transition")
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET, false, false);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_MODESET, false, false);
}
igt_subtest_with_dynamic("plane-all-modeset-transition-fencing")
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET, false, true);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_MODESET, false, true);
}
igt_subtest_with_dynamic("plane-all-modeset-transition-internal-panels") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (!output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET_FAST, false, false);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_MODESET_FAST, false, false);
}
}
igt_subtest_with_dynamic("plane-all-modeset-transition-fencing-internal-panels") {
for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (!output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET_FAST, false, true);
+ run_transition_test(&display, &data, pipe, output, TRANSITION_MODESET_FAST, false, true);
}
}
igt_subtest("plane-toggle-modeset-transition")
- for_each_pipe_with_valid_output(&display, pipe, output)
- run_transition_test(&display, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
+ for_each_pipe_with_valid_output(&display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
+ run_transition_test(&display, &data, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
+ }
igt_subtest_with_dynamic("modeset-transition") {
for (i = 1; i <= count; i++) {
--
2.26.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_atomic_transition:reduce execution time (rev6)
2021-01-05 11:08 [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Nidhi Gupta
@ 2021-01-05 11:53 ` Patchwork
2021-01-05 14:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-07 12:06 ` [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Shankar, Uma
2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-05 11:53 UTC (permalink / raw)
To: Nidhi Gupta; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 3244 bytes --]
== Series Details ==
Series: tests/kms_atomic_transition:reduce execution time (rev6)
URL : https://patchwork.freedesktop.org/series/84516/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9545 -> IGTPW_5353
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/index.html
Known issues
------------
Here are the changes found in IGTPW_5353 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-tgl-y: NOTRUN -> [SKIP][1] ([fdo#109315] / [i915#2575])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/fi-tgl-y/igt@amdgpu/amd_basic@query-info.html
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-y: [PASS][2] -> [DMESG-WARN][3] ([i915#2411] / [i915#402])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/fi-tgl-y/igt@gem_exec_suspend@basic-s3.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/fi-tgl-y/igt@gem_exec_suspend@basic-s3.html
* igt@i915_getparams_basic@basic-subslice-total:
- fi-tgl-y: [PASS][4] -> [DMESG-WARN][5] ([i915#402]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/fi-tgl-y/igt@i915_getparams_basic@basic-subslice-total.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/fi-tgl-y/igt@i915_getparams_basic@basic-subslice-total.html
#### Possible fixes ####
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [FAIL][6] ([i915#1161] / [i915#262]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
* igt@prime_vgem@basic-fence-flip:
- fi-tgl-y: [DMESG-WARN][8] ([i915#402]) -> [PASS][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/fi-tgl-y/igt@prime_vgem@basic-fence-flip.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/fi-tgl-y/igt@prime_vgem@basic-fence-flip.html
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1161]: https://gitlab.freedesktop.org/drm/intel/issues/1161
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (42 -> 36)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-dg1-1 fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5942 -> IGTPW_5353
CI-20190529: 20190529
CI_DRM_9545: a412bacbe58bb98252a6b55f6390857a20689fc6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5353: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/index.html
IGT_5942: e14e76a87c44c684ec958b391b030bb549254f88 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/index.html
[-- Attachment #1.2: Type: text/html, Size: 4084 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: failure for tests/kms_atomic_transition:reduce execution time (rev6)
2021-01-05 11:08 [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Nidhi Gupta
2021-01-05 11:53 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_atomic_transition:reduce execution time (rev6) Patchwork
@ 2021-01-05 14:54 ` Patchwork
2021-01-07 12:06 ` [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Shankar, Uma
2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-05 14:54 UTC (permalink / raw)
To: Nidhi Gupta; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 26803 bytes --]
== Series Details ==
Series: tests/kms_atomic_transition:reduce execution time (rev6)
URL : https://patchwork.freedesktop.org/series/84516/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9545_full -> IGTPW_5353_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_5353_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_5353_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_5353_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions-varying-size:
- shard-hsw: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-hsw5/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions-varying-size.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw4/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions-varying-size.html
New tests
---------
New tests have been introduced between CI_DRM_9545_full and IGTPW_5353_full:
### New IGT tests (2) ###
* igt@gem_spin_batch@legacy:
- Statuses :
- Exec time: [None] s
* igt@gem_spin_batch@legacy-resubmit:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in IGTPW_5353_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-tglb: [PASS][3] -> [DMESG-WARN][4] ([i915#1436] / [i915#1887] / [i915#2411])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb8/igt@gem_ctx_isolation@preservation-s3@bcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb3/igt@gem_ctx_isolation@preservation-s3@bcs0.html
* igt@gem_ctx_isolation@preservation-s3@rcs0:
- shard-tglb: [PASS][5] -> [DMESG-WARN][6] ([i915#1436] / [i915#1602] / [i915#1887] / [i915#2411])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb8/igt@gem_ctx_isolation@preservation-s3@rcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb3/igt@gem_ctx_isolation@preservation-s3@rcs0.html
* igt@gem_ctx_persistence@engines-cleanup:
- shard-hsw: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#1099]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw4/igt@gem_ctx_persistence@engines-cleanup.html
* igt@gem_pread@exhaustion:
- shard-hsw: NOTRUN -> [WARN][8] ([i915#2658])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw6/igt@gem_pread@exhaustion.html
* igt@gen7_exec_parse@bitmasks:
- shard-iclb: NOTRUN -> [SKIP][9] ([fdo#109289])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb1/igt@gen7_exec_parse@bitmasks.html
- shard-tglb: NOTRUN -> [SKIP][10] ([fdo#109289])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb8/igt@gen7_exec_parse@bitmasks.html
* igt@i915_selftest@live@gem_contexts:
- shard-glk: [PASS][11] -> [INCOMPLETE][12] ([i915#2369])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk5/igt@i915_selftest@live@gem_contexts.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk6/igt@i915_selftest@live@gem_contexts.html
* igt@i915_selftest@live@requests:
- shard-glk: [PASS][13] -> [DMESG-WARN][14] ([i915#2826])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk5/igt@i915_selftest@live@requests.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk6/igt@i915_selftest@live@requests.html
* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [PASS][15] -> [FAIL][16] ([i915#2597])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb6/igt@kms_async_flips@test-time-stamp.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb8/igt@kms_async_flips@test-time-stamp.html
* igt@kms_chamelium@hdmi-cmp-planar-formats:
- shard-iclb: NOTRUN -> [SKIP][17] ([fdo#109284] / [fdo#111827]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb4/igt@kms_chamelium@hdmi-cmp-planar-formats.html
* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111827])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl7/igt@kms_chamelium@hdmi-hpd-for-each-pipe.html
- shard-glk: NOTRUN -> [SKIP][19] ([fdo#109271] / [fdo#111827])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk4/igt@kms_chamelium@hdmi-hpd-for-each-pipe.html
- shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271] / [fdo#111827]) +2 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl7/igt@kms_chamelium@hdmi-hpd-for-each-pipe.html
* igt@kms_chamelium@hdmi-hpd-with-enabled-mode:
- shard-hsw: NOTRUN -> [SKIP][21] ([fdo#109271] / [fdo#111827]) +11 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw4/igt@kms_chamelium@hdmi-hpd-with-enabled-mode.html
* igt@kms_color_chamelium@pipe-b-ctm-negative:
- shard-tglb: NOTRUN -> [SKIP][22] ([fdo#109284] / [fdo#111827]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb3/igt@kms_color_chamelium@pipe-b-ctm-negative.html
* igt@kms_cursor_crc@pipe-a-cursor-512x170-sliding:
- shard-kbl: NOTRUN -> [SKIP][23] ([fdo#109271]) +8 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-512x170-sliding.html
* igt@kms_cursor_crc@pipe-b-cursor-512x512-rapid-movement:
- shard-iclb: NOTRUN -> [SKIP][24] ([fdo#109278] / [fdo#109279]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb8/igt@kms_cursor_crc@pipe-b-cursor-512x512-rapid-movement.html
* igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding:
- shard-tglb: NOTRUN -> [SKIP][25] ([fdo#109279]) +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb3/igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding.html
- shard-glk: NOTRUN -> [SKIP][26] ([fdo#109271]) +7 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk3/igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-iclb: NOTRUN -> [SKIP][27] ([fdo#109274] / [fdo#109278])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb2/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [PASS][28] -> [FAIL][29] ([i915#2370])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-hsw4/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html
* igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset:
- shard-tglb: NOTRUN -> [SKIP][30] ([fdo#111825]) +4 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb5/igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset.html
- shard-iclb: NOTRUN -> [SKIP][31] ([fdo#109274])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb5/igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset.html
* igt@kms_flip@flip-vs-blocking-wf-vblank@a-edp1:
- shard-tglb: NOTRUN -> [FAIL][32] ([i915#2122])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb8/igt@kms_flip@flip-vs-blocking-wf-vblank@a-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile:
- shard-apl: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#2642])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
- shard-glk: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#2642])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
- shard-kbl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#2642])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-cpu:
- shard-apl: NOTRUN -> [SKIP][36] ([fdo#109271]) +20 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-pwrite:
- shard-iclb: NOTRUN -> [SKIP][37] ([fdo#109280]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-pwrite.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-tglb: [PASS][38] -> [DMESG-WARN][39] ([i915#1436] / [i915#1602] / [i915#1887] / [i915#2411] / [i915#533])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
- shard-glk: [PASS][40] -> [DMESG-WARN][41] ([i915#1602] / [i915#2635] / [i915#533])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
- shard-apl: [PASS][42] -> [DMESG-WARN][43] ([i915#1602] / [i915#2635] / [i915#533])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
- shard-kbl: [PASS][44] -> [INCOMPLETE][45] ([i915#155] / [i915#648])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-kbl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
- shard-iclb: [PASS][46] -> [DMESG-WARN][47] ([i915#1602])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
- shard-hsw: NOTRUN -> [DMESG-WARN][48] ([i915#2637])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-apl: NOTRUN -> [FAIL][49] ([fdo#108145] / [i915#265])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl3/igt@kms_plane_alpha_blend@pipe-c-alpha-7efc.html
* igt@kms_plane_alpha_blend@pipe-d-coverage-vs-premult-vs-constant:
- shard-iclb: NOTRUN -> [SKIP][50] ([fdo#109278]) +5 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb2/igt@kms_plane_alpha_blend@pipe-d-coverage-vs-premult-vs-constant.html
* igt@kms_plane_lowres@pipe-b-tiling-yf:
- shard-hsw: NOTRUN -> [SKIP][51] ([fdo#109271]) +183 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw4/igt@kms_plane_lowres@pipe-b-tiling-yf.html
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-tglb: NOTRUN -> [SKIP][52] ([fdo#111615])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb7/igt@kms_plane_multiple@atomic-pipe-c-tiling-yf.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][53] -> [SKIP][54] ([fdo#109441]) +2 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vrr@flip-dpms:
- shard-iclb: NOTRUN -> [SKIP][55] ([fdo#109502])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb7/igt@kms_vrr@flip-dpms.html
- shard-tglb: NOTRUN -> [SKIP][56] ([fdo#109502])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb8/igt@kms_vrr@flip-dpms.html
* igt@prime_nv_api@i915_nv_import_vs_close:
- shard-tglb: NOTRUN -> [SKIP][57] ([fdo#109291])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb6/igt@prime_nv_api@i915_nv_import_vs_close.html
- shard-iclb: NOTRUN -> [SKIP][58] ([fdo#109291])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb3/igt@prime_nv_api@i915_nv_import_vs_close.html
* igt@runner@aborted:
- shard-hsw: NOTRUN -> [FAIL][59] ([i915#2295] / [i915#2505])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-hsw7/igt@runner@aborted.html
#### Possible fixes ####
* {igt@gem_exec_fair@basic-deadline}:
- shard-kbl: [FAIL][60] ([i915#2846]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-kbl6/igt@gem_exec_fair@basic-deadline.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl7/igt@gem_exec_fair@basic-deadline.html
* {igt@gem_exec_fair@basic-none-share@rcs0}:
- shard-glk: [FAIL][62] ([i915#2842]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk2/igt@gem_exec_fair@basic-none-share@rcs0.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk3/igt@gem_exec_fair@basic-none-share@rcs0.html
* {igt@gem_exec_fair@basic-pace@bcs0}:
- shard-tglb: [FAIL][64] ([i915#2842]) -> [PASS][65] +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb5/igt@gem_exec_fair@basic-pace@bcs0.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb8/igt@gem_exec_fair@basic-pace@bcs0.html
* {igt@gem_exec_fair@basic-pace@rcs0}:
- shard-kbl: [FAIL][66] ([i915#2842]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-kbl4/igt@gem_exec_fair@basic-pace@rcs0.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl1/igt@gem_exec_fair@basic-pace@rcs0.html
* {igt@gem_exec_schedule@u-fairslice@rcs0}:
- shard-apl: [DMESG-WARN][68] ([i915#1610]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-apl2/igt@gem_exec_schedule@u-fairslice@rcs0.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl1/igt@gem_exec_schedule@u-fairslice@rcs0.html
- shard-iclb: [DMESG-WARN][70] ([i915#2803]) -> [PASS][71]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb1/igt@gem_exec_schedule@u-fairslice@rcs0.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb1/igt@gem_exec_schedule@u-fairslice@rcs0.html
* {igt@gem_exec_schedule@u-fairslice@vcs1}:
- shard-tglb: [DMESG-WARN][72] ([i915#2803]) -> [PASS][73]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb8/igt@gem_exec_schedule@u-fairslice@vcs1.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb8/igt@gem_exec_schedule@u-fairslice@vcs1.html
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [DMESG-WARN][74] ([i915#118] / [i915#95]) -> [PASS][75] +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk3/igt@gem_exec_whisper@basic-queues-forked-all.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk3/igt@gem_exec_whisper@basic-queues-forked-all.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][76] ([i915#454]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-glk: [FAIL][78] ([i915#49]) -> [PASS][79] +1 similar issue
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
- shard-kbl: [FAIL][80] ([i915#49]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-kbl3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
- shard-apl: [FAIL][82] ([i915#49]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-apl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
* igt@kms_plane_lowres@pipe-b-tiling-x:
- shard-kbl: [DMESG-WARN][84] ([i915#165] / [i915#180] / [i915#78]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-kbl2/igt@kms_plane_lowres@pipe-b-tiling-x.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-kbl2/igt@kms_plane_lowres@pipe-b-tiling-x.html
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][86] ([fdo#109441]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb3/igt@kms_psr@psr2_suspend.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb2/igt@kms_psr@psr2_suspend.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][88] ([i915#2684]) -> [WARN][89] ([i915#1804] / [i915#2684])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb5/igt@i915_pm_rc6_residency@rc6-fence.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb6/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][90] ([i915#1226]) -> [SKIP][91] ([fdo#109349])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb1/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@runner@aborted:
- shard-iclb: ([FAIL][92], [FAIL][93]) ([i915#2295] / [i915#2426] / [i915#2724] / [i915#483]) -> ([FAIL][94], [FAIL][95]) ([i915#1814] / [i915#2295] / [i915#2724])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb1/igt@runner@aborted.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-iclb6/igt@runner@aborted.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb2/igt@runner@aborted.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-iclb4/igt@runner@aborted.html
- shard-apl: ([FAIL][96], [FAIL][97]) ([i915#1610] / [i915#2295] / [i915#2426]) -> ([FAIL][98], [FAIL][99]) ([i915#1814] / [i915#2295] / [i915#62])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-apl7/igt@runner@aborted.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-apl2/igt@runner@aborted.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl3/igt@runner@aborted.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-apl2/igt@runner@aborted.html
- shard-glk: [FAIL][100] ([i915#2295] / [k.org#202321]) -> ([FAIL][101], [FAIL][102], [FAIL][103]) ([i915#1814] / [i915#2295] / [k.org#202321])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-glk8/igt@runner@aborted.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk9/igt@runner@aborted.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk1/igt@runner@aborted.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-glk6/igt@runner@aborted.html
- shard-tglb: ([FAIL][104], [FAIL][105]) ([i915#2295] / [i915#2426] / [i915#2667] / [i915#2803]) -> ([FAIL][106], [FAIL][107], [FAIL][108]) ([i915#1814] / [i915#2295] / [i915#2667] / [i915#402])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb8/igt@runner@aborted.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9545/shard-tglb7/igt@runner@aborted.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb7/igt@runner@aborted.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb2/igt@runner@aborted.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/shard-tglb3/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[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#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109502]: https://bugs.freedesktop.org/show_bug.cgi?id=109502
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1887]: https://gitlab.freedesktop.org/drm/intel/issues/1887
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2370]: https://gitlab.freedesktop.org/drm/intel/issues/2370
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#2635]: https://gitlab.freedesktop.org/drm/intel/issues/2635
[i915#2637]: https://gitlab.freedesktop.org/drm/intel/issues/2637
[i915#2642]: https://gitlab.freedesktop.org/drm/intel/issues/2642
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2667]: https://gitlab.freedesktop.org/drm/intel/issues/2667
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2803]: https://gitlab.freedesktop.org/drm/intel/issues/2803
[i915#2804]: https://gitlab.freedesktop.org/drm/intel/issues/2804
[i915#2826]: https://gitlab.freedesktop.org/drm/intel/issues/2826
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#648]: https://gitlab.freedesktop.org/drm/intel/issues/648
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (10 -> 8)
------------------------------
Missing (2): pig-skl-6260u pig-glk-j5005
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5942 -> IGTPW_5353
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_9545: a412bacbe58bb98252a6b55f6390857a20689fc6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5353: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5353/index.html
IGT_5942: e14e76a87c44c684ec958b391b030bb549254f88 @ 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_5353/index.html
[-- Attachment #1.2: Type: text/html, Size: 33484 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time
2021-01-05 11:08 [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Nidhi Gupta
2021-01-05 11:53 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_atomic_transition:reduce execution time (rev6) Patchwork
2021-01-05 14:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
@ 2021-01-07 12:06 ` Shankar, Uma
2 siblings, 0 replies; 7+ messages in thread
From: Shankar, Uma @ 2021-01-07 12:06 UTC (permalink / raw)
To: Gupta, Nidhi1, igt-dev; +Cc: Gupta, Nidhi1
> -----Original Message-----
> From: Nidhi Gupta <nidhi1.gupta@intel.com>
> Sent: Tuesday, January 5, 2021 4:39 PM
> To: igt-dev@lists.freedesktop.org
> Cc: B S, Karthik <karthik.b.s@intel.com>; Shankar, Uma
> <uma.shankar@intel.com>; Gupta, Nidhi1 <nidhi1.gupta@intel.com>
> Subject: [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time
>
> v1: All the subtests are using for_each_pipe_with_valid_output function which
No need to say v1, instead describe what this change is for. Add any timing benefits
wrt execution time.
> will execute on all the possible combination of pipe and output to reduce the
> execution time replaced the function with for_each_pipe_with_single_output
> this will loop over all the pipes but at most once.
>
> v2: kms_atomic_transition test is taking minimum of 69.5s time to execute on CI.
> To reduce the execution time this patch will add the change which will run the
> test on 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane and skip the rest of the
> planes.
>
> v3: combined v1 and v2 in one patch.
>
> v4: -restricted execution of all the subtests to
> 2 pipes. (Uma)
> -Modified skip_plane() function. (Uma)
>
> v5: -added a extended flag, if it is set but the user
s/but/by
> test will be executed on all the pipes otherwise will be
> executed only on 2 pipes. (Karthik)
>
> Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com>
> ---
> tests/kms_atomic_transition.c | 136 +++++++++++++++++++++++++++-------
> 1 file changed, 110 insertions(+), 26 deletions(-)
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index
> 02206f0a..1d0faa67 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -50,6 +50,10 @@ int *timeline;
> pthread_t *thread;
> int *seqno;
>
> +typedef struct {
> + bool extended;
> +} data_t;
I think its good to add igt_display_t *display in this structure itself.
> static void
> run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
> { @@ -120,8 +124,35 @@ static void configure_fencing(igt_plane_t *plane)
> igt_assert_eq(ret, 0);
> }
>
> +static bool skip_plane(igt_display_t *display, data_t *data,
> +igt_plane_t *plane)
If you do the above, then pass just the data_t and display will come along with it.
Do it universally in the patch at all places.
{
> + int index = plane->index;
> +
> + if (data->extended)
> + return false;
> +
> + if (!is_i915_device(display->drm_fd))
> + return false;
> +
> + if (plane->type == DRM_PLANE_TYPE_CURSOR)
> + return false;
> +
> + if (intel_gen(intel_get_drm_devid(display->drm_fd)) < 11)
> + return false;
> +
> + /*
> + * Test 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane.
> + *
> + * Kernel registers planes in the hardware Z order:
> + * 0,1,2 HDR planes
> + * 3,4 SDR UV planes
> + * 5,6 SDR Y planes
> + */
> + return index != 0 && index != 3 && index != 5; }
> +
> static int
> -wm_setup_plane(igt_display_t *display, enum pipe pipe,
> +wm_setup_plane(igt_display_t *display, data_t *data, enum pipe pipe,
> uint32_t mask, struct plane_parms *parms, bool fencing) {
> igt_plane_t *plane;
> @@ -135,6 +166,9 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
> for_each_plane_on_pipe(display, pipe, plane) {
> int i = plane->index;
>
> + if (skip_plane(display, data, plane))
> + continue;
> +
> if (!mask || !(parms[i].mask & mask)) {
> if (plane->values[IGT_PLANE_FB_ID]) {
> igt_plane_set_fb(plane, NULL);
> @@ -205,7 +239,8 @@ static void set_sprite_wh(igt_display_t *display, enum
> pipe pipe, #define is_atomic_check_plane_size_errno(errno) \
> (errno == -EINVAL)
>
> -static void setup_parms(igt_display_t *display, enum pipe pipe,
> +static void setup_parms(igt_display_t *display, data_t *data,
> + enum pipe pipe,
> const drmModeModeInfo *mode,
> struct igt_fb *primary_fb,
> struct igt_fb *argb_fb,
> @@ -298,7 +333,7 @@ static void setup_parms(igt_display_t *display, enum
> pipe pipe,
> set_sprite_wh(display, pipe, parms, sprite_fb,
> alpha, sprite_width, sprite_height);
>
> - wm_setup_plane(display, pipe, (1 << n_planes) - 1, parms, false);
> + wm_setup_plane(display, data, pipe, (1 << n_planes) - 1, parms,
> +false);
> ret = igt_display_try_commit_atomic(display,
> DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
> NULL);
> igt_assert(!is_atomic_check_failure_errno(ret));
>
> @@ -437,7 +472,7 @@ static void wait_for_transition(igt_display_t *display,
> enum pipe pipe, bool non
> * so test this and make sure it works.
> */
> static void
> -run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t
> *output,
> +run_transition_test(igt_display_t *display, data_t *data, enum pipe
> +pipe, igt_output_t *output,
> enum transition_type type, bool nonblocking, bool fencing) {
> struct igt_fb fb, argb_fb, sprite_fb;
> @@ -470,7 +505,7 @@ 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, 0, NULL, false);
> + wm_setup_plane(display, data, pipe, 0, NULL, false);
>
> if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
> igt_output_set_pipe(output, PIPE_NONE); @@ -482,7 +517,7 @@
> run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
>
> igt_display_commit2(display, COMMIT_ATOMIC);
>
> - setup_parms(display, pipe, mode, &fb, &argb_fb, &sprite_fb, parms,
> &iter_max);
> + setup_parms(display, data, pipe, mode, &fb, &argb_fb, &sprite_fb,
> +parms, &iter_max);
>
> /*
> * In some configurations the tests may not run to completion with all
> @@ -490,7 +525,7 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
> * planes to fix this
> */
> while (1) {
> - wm_setup_plane(display, pipe, iter_max - 1, parms, false);
> + wm_setup_plane(display, data, pipe, iter_max - 1, parms, false);
>
> if (fencing)
> igt_pipe_request_out_fence(pipe_obj);
> @@ -524,7 +559,7 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
> if (type == TRANSITION_AFTER_FREE) {
> int fence_fd = -1;
>
> - wm_setup_plane(display, pipe, 0, parms, fencing);
> + wm_setup_plane(display, data, pipe, 0, parms, fencing);
>
> atomic_commit(display, pipe, flags, (void *)(unsigned long)0,
> fencing);
> if (fencing) {
> @@ -560,7 +595,7 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
>
> igt_output_set_pipe(output, pipe);
>
> - if (!wm_setup_plane(display, pipe, i, parms, fencing))
> + if (!wm_setup_plane(display, data, pipe, i, parms, fencing))
> continue;
>
> atomic_commit(display, pipe, flags, (void *)(unsigned long)i,
> fencing); @@ -569,7 +604,7 @@ 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);
>
> - if (!wm_setup_plane(display, pipe, 0, parms, fencing))
> + if (!wm_setup_plane(display, data, pipe, 0, parms,
> fencing))
> continue;
>
> atomic_commit(display, pipe, flags, (void *) 0UL, fencing);
> @@ -586,7 +621,7 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
> n_enable_planes < pipe_obj->n_planes)
> continue;
>
> - if (!wm_setup_plane(display, pipe, j, parms,
> fencing))
> + if (!wm_setup_plane(display, data, pipe, j, parms,
> fencing))
> continue;
>
> if (type >= TRANSITION_MODESET)
> @@ -595,7 +630,7 @@ 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);
>
> - if (!wm_setup_plane(display, pipe, i, parms,
> fencing))
> + if (!wm_setup_plane(display, data, pipe, i, parms,
> fencing))
> continue;
>
> if (type >= TRANSITION_MODESET)
> @@ -913,7 +948,30 @@ static bool output_is_internal_panel(igt_output_t
> *output)
> }
> }
>
> -igt_main
> +static int opt_handler(int opt, int opt_index, void *_data) {
> + data_t *data = _data;
> +
> + switch (opt) {
> + case 'e':
> + data->extended = true;
> + break;
> + }
> +
> + return IGT_OPT_HANDLER_SUCCESS;
> +}
> +
> +static const struct option long_opts[] = {
> + { .name = "extended", .has_arg = false, .val = 'e', },
> + {}
> +};
> +
> +static const char help_str[] =
> + " --extended\t\tRun the extended tests\n";
> +
> +static data_t data;
> +
> +igt_main_args("", long_opts, help_str, opt_handler, &data)
> {
> igt_display_t display;
> igt_output_t *output;
> @@ -935,48 +993,63 @@ igt_main
> }
>
> igt_subtest("plane-primary-toggle-with-vblank-wait")
> - for_each_pipe_with_valid_output(&display, pipe, output)
> + for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> run_primary_test(&display, pipe, output);
> + }
>
> igt_subtest_with_dynamic("plane-all-transition") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, false, false);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_PLANES, false, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-fencing") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, false, true);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_PLANES, false, true);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-nonblocking") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, true, false);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_PLANES, true, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-nonblocking-fencing") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, true, true);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_PLANES, true, true);
> }
> }
>
> igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_AFTER_FREE, true, false);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_AFTER_FREE, true, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind-
> fencing") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_AFTER_FREE, true, true);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_AFTER_FREE, true, true);
> }
> }
>
> @@ -987,45 +1060,56 @@ igt_main
> */
> igt_subtest_with_dynamic("plane-all-modeset-transition")
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET, false, false);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_MODESET, false, false);
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-fencing")
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET, false, true);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_MODESET, false, true);
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-internal-
> panels") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (!output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET_FAST, false, false);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_MODESET_FAST, false, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-fencing-
> internal-panels") {
> for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (!output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET_FAST, false, true);
> + run_transition_test(&display, &data, pipe,
> output,
> +TRANSITION_MODESET_FAST, false, true);
> }
> }
>
> igt_subtest("plane-toggle-modeset-transition")
> - for_each_pipe_with_valid_output(&display, pipe, output)
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET_DISABLE, false, false);
> + for_each_pipe_with_valid_output(&display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> + run_transition_test(&display, &data, pipe, output,
> TRANSITION_MODESET_DISABLE, false, false);
> + }
>
> igt_subtest_with_dynamic("modeset-transition") {
> for (i = 1; i <= count; i++) {
> --
> 2.26.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time
2021-01-12 5:49 Nidhi Gupta
2021-01-27 15:42 ` Shankar, Uma
@ 2021-01-28 4:46 ` Karthik B S
1 sibling, 0 replies; 7+ messages in thread
From: Karthik B S @ 2021-01-28 4:46 UTC (permalink / raw)
To: Nidhi Gupta, igt-dev; +Cc: uma.shanker
On 1/12/2021 11:19 AM, Nidhi Gupta wrote:
> kms_atomic_transition test is taking minimum of
> 69.5s time to execute on CI. To reduce the execution
> time this patch will add the change which will run
> the test on 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane
> and skip the rest of the planes.
>
> v4: -restricted execution of all the subtests to
> 2 pipes. (Uma)
> -Modified skip_plane() function. (Uma)
>
> v5: -added a extended flag, if it is set by the user
> test will be executed on all the pipes otherwise will be
> executed only on 2 pipes. (Karthik)
Hi,
As the extended flag is now being used, no objections from me for this
patch.
One thing I would suggest here based on the feedback received on other
recent patches which are restricting the execution to 2 pipes
is to use a pipe count variable instead of directly having a check of
(pipe >= 2). This will be required if platforms are having 2 pipes as A +C.
With this change the patch looks good to me.
Acked-by: Karthik B S <karthik.b.s@intel.com>
Thanks,
Karthik.B.S
>
> v6: -in previous version extended flag and display passed in
> separate structures now added a data_t structure which includes
> igt_display_t, extended flag and drm_fd in single structure. (Uma)
>
> Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com>
> ---
> tests/kms_atomic_transition.c | 403 ++++++++++++++++++++--------------
> 1 file changed, 244 insertions(+), 159 deletions(-)
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index 02206f0a..3c0567fc 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -45,13 +45,19 @@ struct plane_parms {
> uint32_t width, height, mask;
> };
>
> +typedef struct {
> + int drm_fd;
> + igt_display_t display;
> + bool extended;
> +} data_t;
> +
> /* globals for fence support */
> int *timeline;
> pthread_t *thread;
> int *seqno;
>
> static void
> -run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
> +run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output)
> {
> drmModeModeInfo *mode;
> igt_plane_t *primary;
> @@ -65,34 +71,34 @@ run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
> mode = igt_output_get_mode(output);
>
> igt_plane_set_fb(primary, NULL);
> - ret = igt_display_try_commit_atomic(display, flags, NULL);
> + ret = igt_display_try_commit_atomic(&data->display, flags, NULL);
> igt_skip_on_f(ret == -EINVAL, "Primary plane cannot be disabled separately from output\n");
>
> - igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
> + igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb);
>
> igt_plane_set_fb(primary, &fb);
>
> for (i = 0; i < 4; i++) {
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (!(i & 1))
> - igt_wait_for_vblank(display->drm_fd,
> - display->pipes[pipe].crtc_offset);
> + igt_wait_for_vblank(data->drm_fd,
> + data->display.pipes[pipe].crtc_offset);
>
> igt_plane_set_fb(primary, (i & 1) ? &fb : NULL);
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (i & 1)
> - igt_wait_for_vblank(display->drm_fd,
> - display->pipes[pipe].crtc_offset);
> + igt_wait_for_vblank(data->drm_fd,
> + data->display.pipes[pipe].crtc_offset);
>
> igt_plane_set_fb(primary, (i & 1) ? NULL : &fb);
> }
>
> igt_plane_set_fb(primary, NULL);
> igt_output_set_pipe(output, PIPE_NONE);
> - igt_remove_fb(display->drm_fd, &fb);
> + igt_remove_fb(data->drm_fd, &fb);
> }
>
> static void *fence_inc_thread(void *arg)
> @@ -120,8 +126,35 @@ static void configure_fencing(igt_plane_t *plane)
> igt_assert_eq(ret, 0);
> }
>
> +static bool skip_plane(data_t *data, igt_plane_t *plane)
> +{
> + int index = plane->index;
> +
> + if (data->extended)
> + return false;
> +
> + if (!is_i915_device(data->drm_fd))
> + return false;
> +
> + if (plane->type == DRM_PLANE_TYPE_CURSOR)
> + return false;
> +
> + if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
> + return false;
> +
> + /*
> + * Test 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane.
> + *
> + * Kernel registers planes in the hardware Z order:
> + * 0,1,2 HDR planes
> + * 3,4 SDR UV planes
> + * 5,6 SDR Y planes
> + */
> + return index != 0 && index != 3 && index != 5;
> +}
> +
> static int
> -wm_setup_plane(igt_display_t *display, enum pipe pipe,
> +wm_setup_plane(data_t *data, enum pipe pipe,
> uint32_t mask, struct plane_parms *parms, bool fencing)
> {
> igt_plane_t *plane;
> @@ -132,9 +165,12 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
> * because most of the modeset operations must be fast
> * later on.
> */
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> int i = plane->index;
>
> + if (skip_plane(data, plane))
> + continue;
> +
> if (!mask || !(parms[i].mask & mask)) {
> if (plane->values[IGT_PLANE_FB_ID]) {
> igt_plane_set_fb(plane, NULL);
> @@ -173,13 +209,13 @@ enum transition_type {
> TRANSITION_MODESET_DISABLE,
> };
>
> -static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
> +static void set_sprite_wh(data_t *data, enum pipe pipe,
> struct plane_parms *parms, struct igt_fb *sprite_fb,
> bool alpha, unsigned w, unsigned h)
> {
> igt_plane_t *plane;
>
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> int i = plane->index;
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY ||
> @@ -193,8 +229,8 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
> parms[i].height = h;
> }
>
> - igt_remove_fb(display->drm_fd, sprite_fb);
> - igt_create_fb(display->drm_fd, w, h,
> + igt_remove_fb(data->drm_fd, sprite_fb);
> + igt_create_fb(data->drm_fd, w, h,
> alpha ? DRM_FORMAT_ARGB8888 : DRM_FORMAT_XRGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb);
> }
> @@ -205,7 +241,7 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
> #define is_atomic_check_plane_size_errno(errno) \
> (errno == -EINVAL)
>
> -static void setup_parms(igt_display_t *display, enum pipe pipe,
> +static void setup_parms(data_t *data, enum pipe pipe,
> const drmModeModeInfo *mode,
> struct igt_fb *primary_fb,
> struct igt_fb *argb_fb,
> @@ -216,20 +252,20 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> uint64_t cursor_width, cursor_height;
> unsigned sprite_width, sprite_height, prev_w, prev_h;
> bool max_sprite_width, max_sprite_height, alpha = true;
> - uint32_t n_planes = display->pipes[pipe].n_planes;
> + uint32_t n_planes = data->display.pipes[pipe].n_planes;
> uint32_t n_overlays = 0, overlays[n_planes];
> igt_plane_t *plane;
> uint32_t iter_mask = 3;
>
> - do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
> if (cursor_width >= mode->hdisplay)
> cursor_width = mode->hdisplay;
>
> - do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height));
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height));
> if (cursor_height >= mode->vdisplay)
> cursor_height = mode->vdisplay;
>
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> int i = plane->index;
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
> @@ -272,10 +308,10 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> }
> }
>
> - igt_create_fb(display->drm_fd, cursor_width, cursor_height,
> + igt_create_fb(data->drm_fd, cursor_width, cursor_height,
> DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, argb_fb);
>
> - igt_create_fb(display->drm_fd, cursor_width, cursor_height,
> + igt_create_fb(data->drm_fd, cursor_width, cursor_height,
> DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb);
>
> *iter_max = iter_mask + 1;
> @@ -295,11 +331,11 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> while (!max_sprite_width && !max_sprite_height) {
> int ret;
>
> - set_sprite_wh(display, pipe, parms, sprite_fb,
> + set_sprite_wh(data, pipe, parms, sprite_fb,
> alpha, sprite_width, sprite_height);
>
> - wm_setup_plane(display, pipe, (1 << n_planes) - 1, parms, false);
> - ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + wm_setup_plane(data, pipe, (1 << n_planes) - 1, parms, false);
> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> igt_assert(!is_atomic_check_failure_errno(ret));
>
> if (!is_atomic_check_plane_size_errno(ret)) {
> @@ -327,7 +363,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> igt_assert_f(n_planes >= 3, "No planes left to proceed with!");
> if (n_overlays > 0) {
> uint32_t plane_to_remove = hars_petruska_f54_1_random_unsafe_max(n_overlays);
> - removed_plane = &display->pipes[pipe].planes[overlays[plane_to_remove]];
> + removed_plane = &data->display.pipes[pipe].planes[overlays[plane_to_remove]];
> igt_plane_set_fb(removed_plane, NULL);
> while (plane_to_remove < (n_overlays - 1)) {
> overlays[plane_to_remove] = overlays[plane_to_remove + 1];
> @@ -353,7 +389,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> max_sprite_height = true;
> }
>
> - set_sprite_wh(display, pipe, parms, sprite_fb,
> + set_sprite_wh(data, pipe, parms, sprite_fb,
> alpha, sprite_width, sprite_height);
>
> igt_info("Running test on pipe %s with resolution %dx%d and sprite size %dx%d alpha %i\n",
> @@ -361,14 +397,14 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> sprite_width, sprite_height, alpha);
> }
>
> -static void prepare_fencing(igt_display_t *display, enum pipe pipe)
> +static void prepare_fencing(data_t *data, enum pipe pipe)
> {
> igt_plane_t *plane;
> int n_planes;
>
> igt_require_sw_sync();
>
> - n_planes = display->pipes[pipe].n_planes;
> + n_planes = data->display.pipes[pipe].n_planes;
> timeline = calloc(sizeof(*timeline), n_planes);
> igt_assert_f(timeline != NULL, "Failed to allocate memory for timelines\n");
> thread = calloc(sizeof(*thread), n_planes);
> @@ -376,15 +412,15 @@ static void prepare_fencing(igt_display_t *display, enum pipe pipe)
> seqno = calloc(sizeof(*seqno), n_planes);
> igt_assert_f(seqno != NULL, "Failed to allocate memory for seqno\n");
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> timeline[plane->index] = sw_sync_timeline_create();
> }
>
> -static void unprepare_fencing(igt_display_t *display, enum pipe pipe)
> +static void unprepare_fencing(data_t *data, enum pipe pipe)
> {
> igt_plane_t *plane;
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> close(timeline[plane->index]);
>
> free(timeline);
> @@ -392,12 +428,12 @@ static void unprepare_fencing(igt_display_t *display, enum pipe pipe)
> free(seqno);
> }
>
> -static void atomic_commit(igt_display_t *display, enum pipe pipe, unsigned int flags, void *data, bool fencing)
> +static void atomic_commit(data_t *data_v, enum pipe pipe, unsigned int flags, void *data, bool fencing)
> {
> if (fencing)
> - igt_pipe_request_out_fence(&display->pipes[pipe]);
> + igt_pipe_request_out_fence(&data_v->display.pipes[pipe]);
>
> - igt_display_commit_atomic(display, flags, data);
> + igt_display_commit_atomic(&data_v->display, flags, data);
> }
>
> static int fd_completed(int fd)
> @@ -410,10 +446,10 @@ static int fd_completed(int fd)
> return ret;
> }
>
> -static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool nonblocking, bool fencing)
> +static void wait_for_transition(data_t *data, enum pipe pipe, bool nonblocking, bool fencing)
> {
> if (fencing) {
> - int fence_fd = display->pipes[pipe].out_fence_fd;
> + int fence_fd = data->display.pipes[pipe].out_fence_fd;
>
> if (!nonblocking)
> igt_assert(fd_completed(fence_fd));
> @@ -421,9 +457,9 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
> igt_assert(sync_fence_wait(fence_fd, 30000) == 0);
> } else {
> if (!nonblocking)
> - igt_assert(fd_completed(display->drm_fd));
> + igt_assert(fd_completed(data->drm_fd));
>
> - drmHandleEvent(display->drm_fd, &drm_events);
> + drmHandleEvent(data->drm_fd, &drm_events);
> }
> }
>
> @@ -437,20 +473,20 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
> * so test this and make sure it works.
> */
> static void
> -run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output,
> +run_transition_test(data_t *data, enum pipe pipe, igt_output_t *output,
> enum transition_type type, bool nonblocking, bool fencing)
> {
> struct igt_fb fb, argb_fb, sprite_fb;
> drmModeModeInfo *mode, override_mode;
> igt_plane_t *plane;
> - igt_pipe_t *pipe_obj = &display->pipes[pipe];
> + igt_pipe_t *pipe_obj = &data->display.pipes[pipe];
> uint32_t iter_max, i;
> struct plane_parms parms[pipe_obj->n_planes];
> unsigned flags = 0;
> int ret;
>
> if (fencing)
> - prepare_fencing(display, pipe);
> + prepare_fencing(data, pipe);
> else
> flags |= DRM_MODE_PAGE_FLIP_EVENT;
>
> @@ -465,24 +501,24 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
> /* try to force a modeset */
> override_mode.flags ^= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NHSYNC;
>
> - igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
> + igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb);
>
> igt_output_set_pipe(output, pipe);
>
> - wm_setup_plane(display, pipe, 0, NULL, false);
> + wm_setup_plane(data, pipe, 0, NULL, false);
>
> if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
> igt_output_set_pipe(output, PIPE_NONE);
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> igt_output_set_pipe(output, pipe);
> }
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> - setup_parms(display, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);
> + setup_parms(data, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);
>
> /*
> * In some configurations the tests may not run to completion with all
> @@ -490,19 +526,19 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
> * planes to fix this
> */
> while (1) {
> - wm_setup_plane(display, pipe, iter_max - 1, parms, false);
> + wm_setup_plane(data, pipe, iter_max - 1, parms, false);
>
> if (fencing)
> igt_pipe_request_out_fence(pipe_obj);
>
> - ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> igt_assert(!is_atomic_check_failure_errno(ret));
>
> if (!is_atomic_check_plane_size_errno(ret) || pipe_obj->n_planes < 3)
> break;
>
> ret = 0;
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> i = plane->index;
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY ||
> @@ -519,33 +555,33 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
> igt_skip("Cannot run tests without proper size sprite planes\n");
> }
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (type == TRANSITION_AFTER_FREE) {
> int fence_fd = -1;
>
> - wm_setup_plane(display, pipe, 0, parms, fencing);
> + wm_setup_plane(data, pipe, 0, parms, fencing);
>
> - atomic_commit(display, pipe, flags, (void *)(unsigned long)0, fencing);
> + atomic_commit(data, pipe, flags, (void *)(unsigned long)0, fencing);
> if (fencing) {
> fence_fd = pipe_obj->out_fence_fd;
> pipe_obj->out_fence_fd = -1;
> }
>
> /* force planes to be part of commit */
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> if (parms[plane->index].mask)
> igt_plane_set_position(plane, 0, 0);
> }
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (fence_fd != -1) {
> igt_assert(fd_completed(fence_fd));
> close(fence_fd);
> } else {
> - igt_assert(fd_completed(display->drm_fd));
> - wait_for_transition(display, pipe, false, fencing);
> + igt_assert(fd_completed(data->drm_fd));
> + wait_for_transition(data, pipe, false, fencing);
> }
> goto cleanup;
> }
> @@ -560,20 +596,20 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
>
> igt_output_set_pipe(output, pipe);
>
> - if (!wm_setup_plane(display, pipe, i, parms, fencing))
> + if (!wm_setup_plane(data, pipe, i, parms, fencing))
> continue;
>
> - atomic_commit(display, pipe, flags, (void *)(unsigned long)i, fencing);
> - wait_for_transition(display, pipe, nonblocking, fencing);
> + atomic_commit(data, pipe, flags, (void *)(unsigned long)i, fencing);
> + wait_for_transition(data, pipe, nonblocking, fencing);
>
> if (type == TRANSITION_MODESET_DISABLE) {
> igt_output_set_pipe(output, PIPE_NONE);
>
> - if (!wm_setup_plane(display, pipe, 0, parms, fencing))
> + if (!wm_setup_plane(data, pipe, 0, parms, fencing))
> continue;
>
> - atomic_commit(display, pipe, flags, (void *) 0UL, fencing);
> - wait_for_transition(display, pipe, nonblocking, fencing);
> + atomic_commit(data, pipe, flags, (void *) 0UL, fencing);
> + wait_for_transition(data, pipe, nonblocking, fencing);
> } else {
> uint32_t j;
>
> @@ -586,44 +622,44 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
> n_enable_planes < pipe_obj->n_planes)
> continue;
>
> - if (!wm_setup_plane(display, pipe, j, parms, fencing))
> + if (!wm_setup_plane(data, pipe, j, parms, fencing))
> continue;
>
> if (type >= TRANSITION_MODESET)
> igt_output_override_mode(output, &override_mode);
>
> - atomic_commit(display, pipe, flags, (void *)(unsigned long) j, fencing);
> - wait_for_transition(display, pipe, nonblocking, fencing);
> + atomic_commit(data, pipe, flags, (void *)(unsigned long) j, fencing);
> + wait_for_transition(data, pipe, nonblocking, fencing);
>
> - if (!wm_setup_plane(display, pipe, i, parms, fencing))
> + if (!wm_setup_plane(data, pipe, i, parms, fencing))
> continue;
>
> if (type >= TRANSITION_MODESET)
> igt_output_override_mode(output, NULL);
>
> - atomic_commit(display, pipe, flags, (void *)(unsigned long) i, fencing);
> - wait_for_transition(display, pipe, nonblocking, fencing);
> + atomic_commit(data, pipe, flags, (void *)(unsigned long) i, fencing);
> + wait_for_transition(data, pipe, nonblocking, fencing);
> }
> }
> }
>
> cleanup:
> if (fencing)
> - unprepare_fencing(display, pipe);
> + unprepare_fencing(data, pipe);
>
> igt_output_set_pipe(output, PIPE_NONE);
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> igt_plane_set_fb(plane, NULL);
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> - igt_remove_fb(display->drm_fd, &fb);
> - igt_remove_fb(display->drm_fd, &argb_fb);
> - igt_remove_fb(display->drm_fd, &sprite_fb);
> + igt_remove_fb(data->drm_fd, &fb);
> + igt_remove_fb(data->drm_fd, &argb_fb);
> + igt_remove_fb(data->drm_fd, &sprite_fb);
> }
>
> -static void commit_display(igt_display_t *display, unsigned event_mask, bool nonblocking)
> +static void commit_display(data_t *data, unsigned event_mask, bool nonblocking)
> {
> unsigned flags;
> int num_events = igt_hweight(event_mask);
> @@ -633,7 +669,7 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non
> if (nonblocking)
> flags |= DRM_MODE_ATOMIC_NONBLOCK;
>
> - igt_display_commit_atomic(display, flags, NULL);
> + igt_display_commit_atomic(&data->display, flags, NULL);
>
> igt_debug("Event mask: %x, waiting for %i events\n", event_mask, num_events);
>
> @@ -645,7 +681,7 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non
> struct drm_event_vblank *vblank = (void *)buf;
>
> igt_set_timeout(3, "Timed out while reading drm_fd\n");
> - ret = read(display->drm_fd, buf, sizeof(buf));
> + ret = read(data->drm_fd, buf, sizeof(buf));
> igt_reset_timeout();
> if (ret < 0 && (errno == EINTR || errno == EAGAIN))
> continue;
> @@ -661,23 +697,23 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non
> igt_reset_timeout();
> }
>
> -static unsigned set_combinations(igt_display_t *display, unsigned mask, struct igt_fb *fb)
> +static unsigned set_combinations(data_t *data, unsigned mask, struct igt_fb *fb)
> {
> igt_output_t *output;
> enum pipe pipe;
> unsigned event_mask = 0;
> int i;
>
> - for (i = 0; i < display->n_outputs; i++)
> - igt_output_set_pipe(&display->outputs[i], PIPE_NONE);
> + for (i = 0; i < data->display.n_outputs; i++)
> + igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE);
>
> - for_each_pipe(display, pipe) {
> - igt_plane_t *plane = igt_pipe_get_plane_type(&display->pipes[pipe],
> + for_each_pipe(&data->display, pipe) {
> + igt_plane_t *plane = igt_pipe_get_plane_type(&data->display.pipes[pipe],
> DRM_PLANE_TYPE_PRIMARY);
> drmModeModeInfo *mode = NULL;
>
> if (!(mask & (1 << pipe))) {
> - if (igt_pipe_is_prop_changed(display, pipe, IGT_CRTC_ACTIVE)) {
> + if (igt_pipe_is_prop_changed(&data->display, pipe, IGT_CRTC_ACTIVE)) {
> event_mask |= 1 << pipe;
> igt_plane_set_fb(plane, NULL);
> }
> @@ -687,7 +723,7 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i
>
> event_mask |= 1 << pipe;
>
> - for_each_valid_output_on_pipe(display, pipe, output) {
> + for_each_valid_output_on_pipe(&data->display, pipe, output) {
> if (output->pending_pipe != PIPE_NONE)
> continue;
>
> @@ -707,16 +743,16 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i
> return event_mask;
> }
>
> -static void refresh_primaries(igt_display_t *display, int mask)
> +static void refresh_primaries(data_t *data, int mask)
> {
> enum pipe pipe;
> igt_plane_t *plane;
>
> - for_each_pipe(display, pipe) {
> + for_each_pipe(&data->display, pipe) {
> if (!((1 << pipe) & mask))
> continue;
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> igt_plane_set_position(plane, 0, 0);
> }
> @@ -737,7 +773,7 @@ static void collect_crcs_mask(igt_pipe_crc_t **pipe_crcs, unsigned mask, igt_crc
> }
> }
>
> -static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblocking, bool fencing)
> +static void run_modeset_tests(data_t *data, int howmany, bool nonblocking, bool fencing)
> {
> struct igt_fb fbs[2];
> int i, j = 0;
> @@ -746,33 +782,33 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
> igt_output_t *output;
> unsigned width = 0, height = 0;
>
> - for (i = 0; i < display->n_outputs; i++)
> - igt_output_set_pipe(&display->outputs[i], PIPE_NONE);
> + for (i = 0; i < data->display.n_outputs; i++)
> + igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE);
>
> - for_each_connected_output(display, output) {
> + for_each_connected_output(&data->display, output) {
> drmModeModeInfo *mode = igt_output_get_mode(output);
>
> width = max(width, mode->hdisplay);
> height = max(height, mode->vdisplay);
> }
>
> - igt_create_pattern_fb(display->drm_fd, width, height,
> + igt_create_pattern_fb(data->drm_fd, width, height,
> DRM_FORMAT_XRGB8888, 0, &fbs[0]);
> - igt_create_color_pattern_fb(display->drm_fd, width, height,
> + igt_create_color_pattern_fb(data->drm_fd, width, height,
> DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &fbs[1]);
>
> - for_each_pipe(display, i) {
> - igt_pipe_t *pipe = &display->pipes[i];
> + for_each_pipe(&data->display, i) {
> + igt_pipe_t *pipe = &data->display.pipes[i];
> igt_plane_t *plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> drmModeModeInfo *mode = NULL;
>
> /* count enable pipes to set max iteration */
> j += 1;
>
> - if (is_i915_device(display->drm_fd))
> - pipe_crcs[i] = igt_pipe_crc_new(display->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO);
> + if (is_i915_device(data->drm_fd))
> + pipe_crcs[i] = igt_pipe_crc_new(data->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO);
>
> - for_each_valid_output_on_pipe(display, i, output) {
> + for_each_valid_output_on_pipe(&data->display, i, output) {
> if (output->pending_pipe != PIPE_NONE)
> continue;
>
> @@ -787,7 +823,7 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
> igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
>
> if (fencing)
> - igt_pipe_request_out_fence(&display->pipes[i]);
> + igt_pipe_request_out_fence(&data->display.pipes[i]);
> } else {
> igt_plane_set_fb(plane, NULL);
> }
> @@ -795,7 +831,7 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
>
> iter_max = 1 << j;
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> for (i = 0; i < iter_max; i++) {
> igt_crc_t crcs[5][IGT_MAX_PIPES];
> @@ -804,11 +840,11 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
> if (igt_hweight(i) > howmany)
> continue;
>
> - event_mask = set_combinations(display, i, &fbs[0]);
> + event_mask = set_combinations(data, i, &fbs[0]);
> if (!event_mask && i)
> continue;
>
> - commit_display(display, event_mask, nonblocking);
> + commit_display(data, event_mask, nonblocking);
>
> collect_crcs_mask(pipe_crcs, i, crcs[0]);
>
> @@ -819,30 +855,30 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
> if (igt_hweight(i) < howmany && igt_hweight(j) < howmany)
> continue;
>
> - event_mask = set_combinations(display, j, &fbs[1]);
> + event_mask = set_combinations(data, j, &fbs[1]);
> if (!event_mask)
> continue;
>
> - commit_display(display, event_mask, nonblocking);
> + commit_display(data, event_mask, nonblocking);
>
> collect_crcs_mask(pipe_crcs, j, crcs[1]);
>
> - refresh_primaries(display, j);
> - commit_display(display, j, nonblocking);
> + refresh_primaries(data, j);
> + commit_display(data, j, nonblocking);
> collect_crcs_mask(pipe_crcs, j, crcs[2]);
>
> - event_mask = set_combinations(display, i, &fbs[0]);
> + event_mask = set_combinations(data, i, &fbs[0]);
> if (!event_mask)
> continue;
>
> - commit_display(display, event_mask, nonblocking);
> + commit_display(data, event_mask, nonblocking);
> collect_crcs_mask(pipe_crcs, i, crcs[3]);
>
> - refresh_primaries(display, i);
> - commit_display(display, i, nonblocking);
> + refresh_primaries(data, i);
> + commit_display(data, i, nonblocking);
> collect_crcs_mask(pipe_crcs, i, crcs[4]);
>
> - if (!is_i915_device(display->drm_fd))
> + if (!is_i915_device(data->drm_fd))
> continue;
>
> for (int k = 0; k < IGT_MAX_PIPES; k++) {
> @@ -857,28 +893,28 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
> }
> }
>
> - set_combinations(display, 0, NULL);
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + set_combinations(data, 0, NULL);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> - if (is_i915_device(display->drm_fd)) {
> - for_each_pipe(display, i)
> + if (is_i915_device(data->drm_fd)) {
> + for_each_pipe(&data->display, i)
> igt_pipe_crc_free(pipe_crcs[i]);
> }
>
> - igt_remove_fb(display->drm_fd, &fbs[1]);
> - igt_remove_fb(display->drm_fd, &fbs[0]);
> + igt_remove_fb(data->drm_fd, &fbs[1]);
> + igt_remove_fb(data->drm_fd, &fbs[0]);
> }
>
> -static void run_modeset_transition(igt_display_t *display, int requested_outputs, bool nonblocking, bool fencing)
> +static void run_modeset_transition(data_t *data, int requested_outputs, bool nonblocking, bool fencing)
> {
> igt_output_t *outputs[IGT_MAX_PIPES] = {};
> int num_outputs = 0;
> enum pipe pipe;
>
> - for_each_pipe(display, pipe) {
> + for_each_pipe(&data->display, pipe) {
> igt_output_t *output;
>
> - for_each_valid_output_on_pipe(display, pipe, output) {
> + for_each_valid_output_on_pipe(&data->display, pipe, output) {
> int i;
>
> for (i = pipe - 1; i >= 0; i--)
> @@ -897,7 +933,7 @@ static void run_modeset_transition(igt_display_t *display, int requested_outputs
> "Should have at least %i outputs, found %i\n",
> requested_outputs, num_outputs);
>
> - run_modeset_tests(display, requested_outputs, nonblocking, fencing);
> + run_modeset_tests(data, requested_outputs, nonblocking, fencing);
> }
>
> static bool output_is_internal_panel(igt_output_t *output)
> @@ -913,70 +949,108 @@ static bool output_is_internal_panel(igt_output_t *output)
> }
> }
>
> -igt_main
> +static int opt_handler(int opt, int opt_index, void *_data)
> +{
> + data_t *data = _data;
> +
> + switch (opt) {
> + case 'e':
> + data->extended = true;
> + break;
> + }
> +
> + return IGT_OPT_HANDLER_SUCCESS;
> +}
> +
> +static const struct option long_opts[] = {
> + { .name = "extended", .has_arg = false, .val = 'e', },
> + {}
> +};
> +
> +static const char help_str[] =
> + " --extended\t\tRun the extended tests\n";
> +
> +static data_t data;
> +
> +igt_main_args("", long_opts, help_str, opt_handler, &data)
> {
> - igt_display_t display;
> igt_output_t *output;
> enum pipe pipe;
> int i, count = 0;
>
> igt_fixture {
> - display.drm_fd = drm_open_driver_master(DRIVER_ANY);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> - igt_display_require(&display, display.drm_fd);
> - igt_require(display.is_atomic);
> + igt_display_require(&data.display, data.drm_fd);
> + igt_require(&data.display.is_atomic);
>
> - igt_display_require_output(&display);
> + igt_display_require_output(&data.display);
>
> - for_each_connected_output(&display, output)
> + for_each_connected_output(&data.display, output)
> count++;
> }
>
> igt_subtest("plane-primary-toggle-with-vblank-wait")
> - for_each_pipe_with_valid_output(&display, pipe, output)
> - run_primary_test(&display, pipe, output);
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> + run_primary_test(&data, pipe, output);
> +
> + }
>
> igt_subtest_with_dynamic("plane-all-transition") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, false);
> + run_transition_test(&data, pipe, output, TRANSITION_PLANES, false, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-fencing") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, true);
> + run_transition_test(&data, pipe, output, TRANSITION_PLANES, false, true);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-nonblocking") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_PLANES, true, false);
> + run_transition_test(&data, pipe, output, TRANSITION_PLANES, true, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-nonblocking-fencing") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_PLANES, true, true);
> + run_transition_test(&data, pipe, output, TRANSITION_PLANES, true, true);
> }
> }
>
> igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_AFTER_FREE, true, false);
> + run_transition_test(&data, pipe, output, TRANSITION_AFTER_FREE, true, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind-fencing") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_AFTER_FREE, true, true);
> + run_transition_test(&data, pipe, output, TRANSITION_AFTER_FREE, true, true);
> }
> }
>
> @@ -986,76 +1060,87 @@ igt_main
> * panels with long power cycle delays.
> */
> igt_subtest_with_dynamic("plane-all-modeset-transition")
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_MODESET, false, false);
> + run_transition_test(&data, pipe, output, TRANSITION_MODESET, false, false);
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-fencing")
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_MODESET, false, true);
> + run_transition_test(&data, pipe, output, TRANSITION_MODESET, false, true);
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-internal-panels") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (!output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_MODESET_FAST, false, false);
> + run_transition_test(&data, pipe, output, TRANSITION_MODESET_FAST, false, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-fencing-internal-panels") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (!output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output, TRANSITION_MODESET_FAST, false, true);
> + run_transition_test(&data, pipe, output, TRANSITION_MODESET_FAST, false, true);
> }
> }
>
> igt_subtest("plane-toggle-modeset-transition")
> - for_each_pipe_with_valid_output(&display, pipe, output)
> - run_transition_test(&display, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> + run_transition_test(&data, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
> + }
>
> igt_subtest_with_dynamic("modeset-transition") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, false, false);
> + run_modeset_transition(&data, i, false, false);
> }
> }
>
> igt_subtest_with_dynamic("modeset-transition-nonblocking") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, true, false);
> + run_modeset_transition(&data, i, true, false);
> }
> }
>
> igt_subtest_with_dynamic("modeset-transition-fencing") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, false, true);
> + run_modeset_transition(&data, i, false, true);
> }
> }
>
> igt_subtest_with_dynamic("modeset-transition-nonblocking-fencing") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, true, true);
> + run_modeset_transition(&data, i, true, true);
> }
> }
>
> igt_fixture {
> - igt_display_fini(&display);
> + igt_display_fini(&data.display);
> }
> }
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time
2021-01-12 5:49 Nidhi Gupta
@ 2021-01-27 15:42 ` Shankar, Uma
2021-01-28 4:46 ` Karthik B S
1 sibling, 0 replies; 7+ messages in thread
From: Shankar, Uma @ 2021-01-27 15:42 UTC (permalink / raw)
To: Gupta, Nidhi1, igt-dev; +Cc: Gupta, Nidhi1
> -----Original Message-----
> From: igt-dev <igt-dev-bounces@lists.freedesktop.org> On Behalf Of Nidhi Gupta
> Sent: Tuesday, January 12, 2021 11:20 AM
> To: igt-dev@lists.freedesktop.org
> Cc: Gupta, Nidhi1 <nidhi1.gupta@intel.com>; uma.shanker@intel.com
> Subject: [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution
> time
>
> kms_atomic_transition test is taking minimum of 69.5s time to execute on CI. To
> reduce the execution time this patch will add the change which will run the test
> on 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane and skip the rest of the planes.
>
> v4: -restricted execution of all the subtests to
> 2 pipes. (Uma)
> -Modified skip_plane() function. (Uma)
>
> v5: -added a extended flag, if it is set by the user
> test will be executed on all the pipes otherwise will be
> executed only on 2 pipes. (Karthik)
>
> v6: -in previous version extended flag and display passed in
> separate structures now added a data_t structure which includes
> igt_display_t, extended flag and drm_fd in single structure. (Uma)
Looks good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com>
> ---
> tests/kms_atomic_transition.c | 403 ++++++++++++++++++++--------------
> 1 file changed, 244 insertions(+), 159 deletions(-)
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index
> 02206f0a..3c0567fc 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -45,13 +45,19 @@ struct plane_parms {
> uint32_t width, height, mask;
> };
>
> +typedef struct {
> + int drm_fd;
> + igt_display_t display;
> + bool extended;
> +} data_t;
> +
> /* globals for fence support */
> int *timeline;
> pthread_t *thread;
> int *seqno;
>
> static void
> -run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
> +run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output)
> {
> drmModeModeInfo *mode;
> igt_plane_t *primary;
> @@ -65,34 +71,34 @@ run_primary_test(igt_display_t *display, enum pipe pipe,
> igt_output_t *output)
> mode = igt_output_get_mode(output);
>
> igt_plane_set_fb(primary, NULL);
> - ret = igt_display_try_commit_atomic(display, flags, NULL);
> + ret = igt_display_try_commit_atomic(&data->display, flags, NULL);
> igt_skip_on_f(ret == -EINVAL, "Primary plane cannot be disabled
> separately from output\n");
>
> - igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
> + igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> DRM_FORMAT_XRGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE, &fb);
>
> igt_plane_set_fb(primary, &fb);
>
> for (i = 0; i < 4; i++) {
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (!(i & 1))
> - igt_wait_for_vblank(display->drm_fd,
> - display->pipes[pipe].crtc_offset);
> + igt_wait_for_vblank(data->drm_fd,
> + data->display.pipes[pipe].crtc_offset);
>
> igt_plane_set_fb(primary, (i & 1) ? &fb : NULL);
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (i & 1)
> - igt_wait_for_vblank(display->drm_fd,
> - display->pipes[pipe].crtc_offset);
> + igt_wait_for_vblank(data->drm_fd,
> + data->display.pipes[pipe].crtc_offset);
>
> igt_plane_set_fb(primary, (i & 1) ? NULL : &fb);
> }
>
> igt_plane_set_fb(primary, NULL);
> igt_output_set_pipe(output, PIPE_NONE);
> - igt_remove_fb(display->drm_fd, &fb);
> + igt_remove_fb(data->drm_fd, &fb);
> }
>
> static void *fence_inc_thread(void *arg) @@ -120,8 +126,35 @@ static void
> configure_fencing(igt_plane_t *plane)
> igt_assert_eq(ret, 0);
> }
>
> +static bool skip_plane(data_t *data, igt_plane_t *plane) {
> + int index = plane->index;
> +
> + if (data->extended)
> + return false;
> +
> + if (!is_i915_device(data->drm_fd))
> + return false;
> +
> + if (plane->type == DRM_PLANE_TYPE_CURSOR)
> + return false;
> +
> + if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
> + return false;
> +
> + /*
> + * Test 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane.
> + *
> + * Kernel registers planes in the hardware Z order:
> + * 0,1,2 HDR planes
> + * 3,4 SDR UV planes
> + * 5,6 SDR Y planes
> + */
> + return index != 0 && index != 3 && index != 5; }
> +
> static int
> -wm_setup_plane(igt_display_t *display, enum pipe pipe,
> +wm_setup_plane(data_t *data, enum pipe pipe,
> uint32_t mask, struct plane_parms *parms, bool fencing) {
> igt_plane_t *plane;
> @@ -132,9 +165,12 @@ wm_setup_plane(igt_display_t *display, enum pipe
> pipe,
> * because most of the modeset operations must be fast
> * later on.
> */
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> int i = plane->index;
>
> + if (skip_plane(data, plane))
> + continue;
> +
> if (!mask || !(parms[i].mask & mask)) {
> if (plane->values[IGT_PLANE_FB_ID]) {
> igt_plane_set_fb(plane, NULL);
> @@ -173,13 +209,13 @@ enum transition_type {
> TRANSITION_MODESET_DISABLE,
> };
>
> -static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
> +static void set_sprite_wh(data_t *data, enum pipe pipe,
> struct plane_parms *parms, struct igt_fb *sprite_fb,
> bool alpha, unsigned w, unsigned h) {
> igt_plane_t *plane;
>
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> int i = plane->index;
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY || @@ -193,8
> +229,8 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
> parms[i].height = h;
> }
>
> - igt_remove_fb(display->drm_fd, sprite_fb);
> - igt_create_fb(display->drm_fd, w, h,
> + igt_remove_fb(data->drm_fd, sprite_fb);
> + igt_create_fb(data->drm_fd, w, h,
> alpha ? DRM_FORMAT_ARGB8888 :
> DRM_FORMAT_XRGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb); } @@ -205,7
> +241,7 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
> #define is_atomic_check_plane_size_errno(errno) \
> (errno == -EINVAL)
>
> -static void setup_parms(igt_display_t *display, enum pipe pipe,
> +static void setup_parms(data_t *data, enum pipe pipe,
> const drmModeModeInfo *mode,
> struct igt_fb *primary_fb,
> struct igt_fb *argb_fb,
> @@ -216,20 +252,20 @@ static void setup_parms(igt_display_t *display, enum
> pipe pipe,
> uint64_t cursor_width, cursor_height;
> unsigned sprite_width, sprite_height, prev_w, prev_h;
> bool max_sprite_width, max_sprite_height, alpha = true;
> - uint32_t n_planes = display->pipes[pipe].n_planes;
> + uint32_t n_planes = data->display.pipes[pipe].n_planes;
> uint32_t n_overlays = 0, overlays[n_planes];
> igt_plane_t *plane;
> uint32_t iter_mask = 3;
>
> - do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_WIDTH,
> &cursor_width));
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH,
> +&cursor_width));
> if (cursor_width >= mode->hdisplay)
> cursor_width = mode->hdisplay;
>
> - do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_HEIGHT,
> &cursor_height));
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_HEIGHT,
> +&cursor_height));
> if (cursor_height >= mode->vdisplay)
> cursor_height = mode->vdisplay;
>
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> int i = plane->index;
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY) { @@ -272,10
> +308,10 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> }
> }
>
> - igt_create_fb(display->drm_fd, cursor_width, cursor_height,
> + igt_create_fb(data->drm_fd, cursor_width, cursor_height,
> DRM_FORMAT_ARGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE, argb_fb);
>
> - igt_create_fb(display->drm_fd, cursor_width, cursor_height,
> + igt_create_fb(data->drm_fd, cursor_width, cursor_height,
> DRM_FORMAT_ARGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb);
>
> *iter_max = iter_mask + 1;
> @@ -295,11 +331,11 @@ static void setup_parms(igt_display_t *display, enum
> pipe pipe,
> while (!max_sprite_width && !max_sprite_height) {
> int ret;
>
> - set_sprite_wh(display, pipe, parms, sprite_fb,
> + set_sprite_wh(data, pipe, parms, sprite_fb,
> alpha, sprite_width, sprite_height);
>
> - wm_setup_plane(display, pipe, (1 << n_planes) - 1, parms, false);
> - ret = igt_display_try_commit_atomic(display,
> DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
> NULL);
> + wm_setup_plane(data, pipe, (1 << n_planes) - 1, parms, false);
> + ret = igt_display_try_commit_atomic(&data->display,
> +DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
> NULL);
> igt_assert(!is_atomic_check_failure_errno(ret));
>
> if (!is_atomic_check_plane_size_errno(ret)) { @@ -327,7 +363,7
> @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> igt_assert_f(n_planes >= 3, "No planes left to proceed
> with!");
> if (n_overlays > 0) {
> uint32_t plane_to_remove =
> hars_petruska_f54_1_random_unsafe_max(n_overlays);
> - removed_plane = &display-
> >pipes[pipe].planes[overlays[plane_to_remove]];
> + removed_plane =
> +&data->display.pipes[pipe].planes[overlays[plane_to_remove]];
> igt_plane_set_fb(removed_plane, NULL);
> while (plane_to_remove < (n_overlays - 1)) {
> overlays[plane_to_remove] =
> overlays[plane_to_remove + 1]; @@ -353,7 +389,7 @@ static void
> setup_parms(igt_display_t *display, enum pipe pipe,
> max_sprite_height = true;
> }
>
> - set_sprite_wh(display, pipe, parms, sprite_fb,
> + set_sprite_wh(data, pipe, parms, sprite_fb,
> alpha, sprite_width, sprite_height);
>
> igt_info("Running test on pipe %s with resolution %dx%d and sprite size
> %dx%d alpha %i\n", @@ -361,14 +397,14 @@ static void
> setup_parms(igt_display_t *display, enum pipe pipe,
> sprite_width, sprite_height, alpha); }
>
> -static void prepare_fencing(igt_display_t *display, enum pipe pipe)
> +static void prepare_fencing(data_t *data, enum pipe pipe)
> {
> igt_plane_t *plane;
> int n_planes;
>
> igt_require_sw_sync();
>
> - n_planes = display->pipes[pipe].n_planes;
> + n_planes = data->display.pipes[pipe].n_planes;
> timeline = calloc(sizeof(*timeline), n_planes);
> igt_assert_f(timeline != NULL, "Failed to allocate memory for
> timelines\n");
> thread = calloc(sizeof(*thread), n_planes); @@ -376,15 +412,15 @@
> static void prepare_fencing(igt_display_t *display, enum pipe pipe)
> seqno = calloc(sizeof(*seqno), n_planes);
> igt_assert_f(seqno != NULL, "Failed to allocate memory for seqno\n");
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> timeline[plane->index] = sw_sync_timeline_create(); }
>
> -static void unprepare_fencing(igt_display_t *display, enum pipe pipe)
> +static void unprepare_fencing(data_t *data, enum pipe pipe)
> {
> igt_plane_t *plane;
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> close(timeline[plane->index]);
>
> free(timeline);
> @@ -392,12 +428,12 @@ static void unprepare_fencing(igt_display_t *display,
> enum pipe pipe)
> free(seqno);
> }
>
> -static void atomic_commit(igt_display_t *display, enum pipe pipe, unsigned int
> flags, void *data, bool fencing)
> +static void atomic_commit(data_t *data_v, enum pipe pipe, unsigned int
> +flags, void *data, bool fencing)
> {
> if (fencing)
> - igt_pipe_request_out_fence(&display->pipes[pipe]);
> + igt_pipe_request_out_fence(&data_v->display.pipes[pipe]);
>
> - igt_display_commit_atomic(display, flags, data);
> + igt_display_commit_atomic(&data_v->display, flags, data);
> }
>
> static int fd_completed(int fd)
> @@ -410,10 +446,10 @@ static int fd_completed(int fd)
> return ret;
> }
>
> -static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool
> nonblocking, bool fencing)
> +static void wait_for_transition(data_t *data, enum pipe pipe, bool
> +nonblocking, bool fencing)
> {
> if (fencing) {
> - int fence_fd = display->pipes[pipe].out_fence_fd;
> + int fence_fd = data->display.pipes[pipe].out_fence_fd;
>
> if (!nonblocking)
> igt_assert(fd_completed(fence_fd));
> @@ -421,9 +457,9 @@ static void wait_for_transition(igt_display_t *display,
> enum pipe pipe, bool non
> igt_assert(sync_fence_wait(fence_fd, 30000) == 0);
> } else {
> if (!nonblocking)
> - igt_assert(fd_completed(display->drm_fd));
> + igt_assert(fd_completed(data->drm_fd));
>
> - drmHandleEvent(display->drm_fd, &drm_events);
> + drmHandleEvent(data->drm_fd, &drm_events);
> }
> }
>
> @@ -437,20 +473,20 @@ static void wait_for_transition(igt_display_t *display,
> enum pipe pipe, bool non
> * so test this and make sure it works.
> */
> static void
> -run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t
> *output,
> +run_transition_test(data_t *data, enum pipe pipe, igt_output_t *output,
> enum transition_type type, bool nonblocking, bool fencing) {
> struct igt_fb fb, argb_fb, sprite_fb;
> drmModeModeInfo *mode, override_mode;
> igt_plane_t *plane;
> - igt_pipe_t *pipe_obj = &display->pipes[pipe];
> + igt_pipe_t *pipe_obj = &data->display.pipes[pipe];
> uint32_t iter_max, i;
> struct plane_parms parms[pipe_obj->n_planes];
> unsigned flags = 0;
> int ret;
>
> if (fencing)
> - prepare_fencing(display, pipe);
> + prepare_fencing(data, pipe);
> else
> flags |= DRM_MODE_PAGE_FLIP_EVENT;
>
> @@ -465,24 +501,24 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
> /* try to force a modeset */
> override_mode.flags ^= DRM_MODE_FLAG_PHSYNC |
> DRM_MODE_FLAG_NHSYNC;
>
> - igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
> + igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> DRM_FORMAT_XRGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE, &fb);
>
> igt_output_set_pipe(output, pipe);
>
> - wm_setup_plane(display, pipe, 0, NULL, false);
> + wm_setup_plane(data, pipe, 0, NULL, false);
>
> if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
> igt_output_set_pipe(output, PIPE_NONE);
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> igt_output_set_pipe(output, pipe);
> }
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> - setup_parms(display, pipe, mode, &fb, &argb_fb, &sprite_fb, parms,
> &iter_max);
> + setup_parms(data, pipe, mode, &fb, &argb_fb, &sprite_fb, parms,
> +&iter_max);
>
> /*
> * In some configurations the tests may not run to completion with all
> @@ -490,19 +526,19 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
> * planes to fix this
> */
> while (1) {
> - wm_setup_plane(display, pipe, iter_max - 1, parms, false);
> + wm_setup_plane(data, pipe, iter_max - 1, parms, false);
>
> if (fencing)
> igt_pipe_request_out_fence(pipe_obj);
>
> - ret = igt_display_try_commit_atomic(display,
> DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
> NULL);
> + ret = igt_display_try_commit_atomic(&data->display,
> +DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
> NULL);
> igt_assert(!is_atomic_check_failure_errno(ret));
>
> if (!is_atomic_check_plane_size_errno(ret) || pipe_obj->n_planes
> < 3)
> break;
>
> ret = 0;
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> i = plane->index;
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY || @@ -
> 519,33 +555,33 @@ run_transition_test(igt_display_t *display, enum pipe pipe,
> igt_output_t *output
> igt_skip("Cannot run tests without proper size sprite
> planes\n");
> }
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (type == TRANSITION_AFTER_FREE) {
> int fence_fd = -1;
>
> - wm_setup_plane(display, pipe, 0, parms, fencing);
> + wm_setup_plane(data, pipe, 0, parms, fencing);
>
> - atomic_commit(display, pipe, flags, (void *)(unsigned long)0,
> fencing);
> + atomic_commit(data, pipe, flags, (void *)(unsigned long)0,
> fencing);
> if (fencing) {
> fence_fd = pipe_obj->out_fence_fd;
> pipe_obj->out_fence_fd = -1;
> }
>
> /* force planes to be part of commit */
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> if (parms[plane->index].mask)
> igt_plane_set_position(plane, 0, 0);
> }
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> if (fence_fd != -1) {
> igt_assert(fd_completed(fence_fd));
> close(fence_fd);
> } else {
> - igt_assert(fd_completed(display->drm_fd));
> - wait_for_transition(display, pipe, false, fencing);
> + igt_assert(fd_completed(data->drm_fd));
> + wait_for_transition(data, pipe, false, fencing);
> }
> goto cleanup;
> }
> @@ -560,20 +596,20 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
>
> igt_output_set_pipe(output, pipe);
>
> - if (!wm_setup_plane(display, pipe, i, parms, fencing))
> + if (!wm_setup_plane(data, pipe, i, parms, fencing))
> continue;
>
> - atomic_commit(display, pipe, flags, (void *)(unsigned long)i,
> fencing);
> - wait_for_transition(display, pipe, nonblocking, fencing);
> + atomic_commit(data, pipe, flags, (void *)(unsigned long)i,
> fencing);
> + wait_for_transition(data, pipe, nonblocking, fencing);
>
> if (type == TRANSITION_MODESET_DISABLE) {
> igt_output_set_pipe(output, PIPE_NONE);
>
> - if (!wm_setup_plane(display, pipe, 0, parms, fencing))
> + if (!wm_setup_plane(data, pipe, 0, parms, fencing))
> continue;
>
> - atomic_commit(display, pipe, flags, (void *) 0UL, fencing);
> - wait_for_transition(display, pipe, nonblocking, fencing);
> + atomic_commit(data, pipe, flags, (void *) 0UL, fencing);
> + wait_for_transition(data, pipe, nonblocking, fencing);
> } else {
> uint32_t j;
>
> @@ -586,44 +622,44 @@ run_transition_test(igt_display_t *display, enum pipe
> pipe, igt_output_t *output
> n_enable_planes < pipe_obj->n_planes)
> continue;
>
> - if (!wm_setup_plane(display, pipe, j, parms,
> fencing))
> + if (!wm_setup_plane(data, pipe, j, parms,
> fencing))
> continue;
>
> if (type >= TRANSITION_MODESET)
> igt_output_override_mode(output,
> &override_mode);
>
> - atomic_commit(display, pipe, flags, (void
> *)(unsigned long) j, fencing);
> - wait_for_transition(display, pipe, nonblocking,
> fencing);
> + atomic_commit(data, pipe, flags, (void
> *)(unsigned long) j, fencing);
> + wait_for_transition(data, pipe, nonblocking,
> fencing);
>
> - if (!wm_setup_plane(display, pipe, i, parms,
> fencing))
> + if (!wm_setup_plane(data, pipe, i, parms,
> fencing))
> continue;
>
> if (type >= TRANSITION_MODESET)
> igt_output_override_mode(output,
> NULL);
>
> - atomic_commit(display, pipe, flags, (void
> *)(unsigned long) i, fencing);
> - wait_for_transition(display, pipe, nonblocking,
> fencing);
> + atomic_commit(data, pipe, flags, (void
> *)(unsigned long) i, fencing);
> + wait_for_transition(data, pipe, nonblocking,
> fencing);
> }
> }
> }
>
> cleanup:
> if (fencing)
> - unprepare_fencing(display, pipe);
> + unprepare_fencing(data, pipe);
>
> igt_output_set_pipe(output, PIPE_NONE);
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> igt_plane_set_fb(plane, NULL);
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> - igt_remove_fb(display->drm_fd, &fb);
> - igt_remove_fb(display->drm_fd, &argb_fb);
> - igt_remove_fb(display->drm_fd, &sprite_fb);
> + igt_remove_fb(data->drm_fd, &fb);
> + igt_remove_fb(data->drm_fd, &argb_fb);
> + igt_remove_fb(data->drm_fd, &sprite_fb);
> }
>
> -static void commit_display(igt_display_t *display, unsigned event_mask, bool
> nonblocking)
> +static void commit_display(data_t *data, unsigned event_mask, bool
> +nonblocking)
> {
> unsigned flags;
> int num_events = igt_hweight(event_mask); @@ -633,7 +669,7 @@ static
> void commit_display(igt_display_t *display, unsigned event_mask, bool non
> if (nonblocking)
> flags |= DRM_MODE_ATOMIC_NONBLOCK;
>
> - igt_display_commit_atomic(display, flags, NULL);
> + igt_display_commit_atomic(&data->display, flags, NULL);
>
> igt_debug("Event mask: %x, waiting for %i events\n", event_mask,
> num_events);
>
> @@ -645,7 +681,7 @@ static void commit_display(igt_display_t *display,
> unsigned event_mask, bool non
> struct drm_event_vblank *vblank = (void *)buf;
>
> igt_set_timeout(3, "Timed out while reading drm_fd\n");
> - ret = read(display->drm_fd, buf, sizeof(buf));
> + ret = read(data->drm_fd, buf, sizeof(buf));
> igt_reset_timeout();
> if (ret < 0 && (errno == EINTR || errno == EAGAIN))
> continue;
> @@ -661,23 +697,23 @@ static void commit_display(igt_display_t *display,
> unsigned event_mask, bool non
> igt_reset_timeout();
> }
>
> -static unsigned set_combinations(igt_display_t *display, unsigned mask, struct
> igt_fb *fb)
> +static unsigned set_combinations(data_t *data, unsigned mask, struct
> +igt_fb *fb)
> {
> igt_output_t *output;
> enum pipe pipe;
> unsigned event_mask = 0;
> int i;
>
> - for (i = 0; i < display->n_outputs; i++)
> - igt_output_set_pipe(&display->outputs[i], PIPE_NONE);
> + for (i = 0; i < data->display.n_outputs; i++)
> + igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE);
>
> - for_each_pipe(display, pipe) {
> - igt_plane_t *plane = igt_pipe_get_plane_type(&display-
> >pipes[pipe],
> + for_each_pipe(&data->display, pipe) {
> + igt_plane_t *plane =
> +igt_pipe_get_plane_type(&data->display.pipes[pipe],
> DRM_PLANE_TYPE_PRIMARY);
> drmModeModeInfo *mode = NULL;
>
> if (!(mask & (1 << pipe))) {
> - if (igt_pipe_is_prop_changed(display, pipe,
> IGT_CRTC_ACTIVE)) {
> + if (igt_pipe_is_prop_changed(&data->display, pipe,
> IGT_CRTC_ACTIVE))
> +{
> event_mask |= 1 << pipe;
> igt_plane_set_fb(plane, NULL);
> }
> @@ -687,7 +723,7 @@ static unsigned set_combinations(igt_display_t *display,
> unsigned mask, struct i
>
> event_mask |= 1 << pipe;
>
> - for_each_valid_output_on_pipe(display, pipe, output) {
> + for_each_valid_output_on_pipe(&data->display, pipe, output) {
> if (output->pending_pipe != PIPE_NONE)
> continue;
>
> @@ -707,16 +743,16 @@ static unsigned set_combinations(igt_display_t
> *display, unsigned mask, struct i
> return event_mask;
> }
>
> -static void refresh_primaries(igt_display_t *display, int mask)
> +static void refresh_primaries(data_t *data, int mask)
> {
> enum pipe pipe;
> igt_plane_t *plane;
>
> - for_each_pipe(display, pipe) {
> + for_each_pipe(&data->display, pipe) {
> if (!((1 << pipe) & mask))
> continue;
>
> - for_each_plane_on_pipe(display, pipe, plane)
> + for_each_plane_on_pipe(&data->display, pipe, plane)
> if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> igt_plane_set_position(plane, 0, 0);
> }
> @@ -737,7 +773,7 @@ static void collect_crcs_mask(igt_pipe_crc_t **pipe_crcs,
> unsigned mask, igt_crc
> }
> }
>
> -static void run_modeset_tests(igt_display_t *display, int howmany, bool
> nonblocking, bool fencing)
> +static void run_modeset_tests(data_t *data, int howmany, bool
> +nonblocking, bool fencing)
> {
> struct igt_fb fbs[2];
> int i, j = 0;
> @@ -746,33 +782,33 @@ static void run_modeset_tests(igt_display_t *display,
> int howmany, bool nonblock
> igt_output_t *output;
> unsigned width = 0, height = 0;
>
> - for (i = 0; i < display->n_outputs; i++)
> - igt_output_set_pipe(&display->outputs[i], PIPE_NONE);
> + for (i = 0; i < data->display.n_outputs; i++)
> + igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE);
>
> - for_each_connected_output(display, output) {
> + for_each_connected_output(&data->display, output) {
> drmModeModeInfo *mode = igt_output_get_mode(output);
>
> width = max(width, mode->hdisplay);
> height = max(height, mode->vdisplay);
> }
>
> - igt_create_pattern_fb(display->drm_fd, width, height,
> + igt_create_pattern_fb(data->drm_fd, width, height,
> DRM_FORMAT_XRGB8888, 0, &fbs[0]);
> - igt_create_color_pattern_fb(display->drm_fd, width, height,
> + igt_create_color_pattern_fb(data->drm_fd, width, height,
> DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &fbs[1]);
>
> - for_each_pipe(display, i) {
> - igt_pipe_t *pipe = &display->pipes[i];
> + for_each_pipe(&data->display, i) {
> + igt_pipe_t *pipe = &data->display.pipes[i];
> igt_plane_t *plane = igt_pipe_get_plane_type(pipe,
> DRM_PLANE_TYPE_PRIMARY);
> drmModeModeInfo *mode = NULL;
>
> /* count enable pipes to set max iteration */
> j += 1;
>
> - if (is_i915_device(display->drm_fd))
> - pipe_crcs[i] = igt_pipe_crc_new(display->drm_fd, i,
> INTEL_PIPE_CRC_SOURCE_AUTO);
> + if (is_i915_device(data->drm_fd))
> + pipe_crcs[i] = igt_pipe_crc_new(data->drm_fd, i,
> +INTEL_PIPE_CRC_SOURCE_AUTO);
>
> - for_each_valid_output_on_pipe(display, i, output) {
> + for_each_valid_output_on_pipe(&data->display, i, output) {
> if (output->pending_pipe != PIPE_NONE)
> continue;
>
> @@ -787,7 +823,7 @@ static void run_modeset_tests(igt_display_t *display, int
> howmany, bool nonblock
> igt_plane_set_size(plane, mode->hdisplay, mode-
> >vdisplay);
>
> if (fencing)
> - igt_pipe_request_out_fence(&display->pipes[i]);
> + igt_pipe_request_out_fence(&data-
> >display.pipes[i]);
> } else {
> igt_plane_set_fb(plane, NULL);
> }
> @@ -795,7 +831,7 @@ static void run_modeset_tests(igt_display_t *display, int
> howmany, bool nonblock
>
> iter_max = 1 << j;
>
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> for (i = 0; i < iter_max; i++) {
> igt_crc_t crcs[5][IGT_MAX_PIPES];
> @@ -804,11 +840,11 @@ static void run_modeset_tests(igt_display_t *display,
> int howmany, bool nonblock
> if (igt_hweight(i) > howmany)
> continue;
>
> - event_mask = set_combinations(display, i, &fbs[0]);
> + event_mask = set_combinations(data, i, &fbs[0]);
> if (!event_mask && i)
> continue;
>
> - commit_display(display, event_mask, nonblocking);
> + commit_display(data, event_mask, nonblocking);
>
> collect_crcs_mask(pipe_crcs, i, crcs[0]);
>
> @@ -819,30 +855,30 @@ static void run_modeset_tests(igt_display_t *display,
> int howmany, bool nonblock
> if (igt_hweight(i) < howmany && igt_hweight(j) <
> howmany)
> continue;
>
> - event_mask = set_combinations(display, j, &fbs[1]);
> + event_mask = set_combinations(data, j, &fbs[1]);
> if (!event_mask)
> continue;
>
> - commit_display(display, event_mask, nonblocking);
> + commit_display(data, event_mask, nonblocking);
>
> collect_crcs_mask(pipe_crcs, j, crcs[1]);
>
> - refresh_primaries(display, j);
> - commit_display(display, j, nonblocking);
> + refresh_primaries(data, j);
> + commit_display(data, j, nonblocking);
> collect_crcs_mask(pipe_crcs, j, crcs[2]);
>
> - event_mask = set_combinations(display, i, &fbs[0]);
> + event_mask = set_combinations(data, i, &fbs[0]);
> if (!event_mask)
> continue;
>
> - commit_display(display, event_mask, nonblocking);
> + commit_display(data, event_mask, nonblocking);
> collect_crcs_mask(pipe_crcs, i, crcs[3]);
>
> - refresh_primaries(display, i);
> - commit_display(display, i, nonblocking);
> + refresh_primaries(data, i);
> + commit_display(data, i, nonblocking);
> collect_crcs_mask(pipe_crcs, i, crcs[4]);
>
> - if (!is_i915_device(display->drm_fd))
> + if (!is_i915_device(data->drm_fd))
> continue;
>
> for (int k = 0; k < IGT_MAX_PIPES; k++) { @@ -857,28
> +893,28 @@ static void run_modeset_tests(igt_display_t *display, int howmany,
> bool nonblock
> }
> }
>
> - set_combinations(display, 0, NULL);
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + set_combinations(data, 0, NULL);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> - if (is_i915_device(display->drm_fd)) {
> - for_each_pipe(display, i)
> + if (is_i915_device(data->drm_fd)) {
> + for_each_pipe(&data->display, i)
> igt_pipe_crc_free(pipe_crcs[i]);
> }
>
> - igt_remove_fb(display->drm_fd, &fbs[1]);
> - igt_remove_fb(display->drm_fd, &fbs[0]);
> + igt_remove_fb(data->drm_fd, &fbs[1]);
> + igt_remove_fb(data->drm_fd, &fbs[0]);
> }
>
> -static void run_modeset_transition(igt_display_t *display, int
> requested_outputs, bool nonblocking, bool fencing)
> +static void run_modeset_transition(data_t *data, int requested_outputs,
> +bool nonblocking, bool fencing)
> {
> igt_output_t *outputs[IGT_MAX_PIPES] = {};
> int num_outputs = 0;
> enum pipe pipe;
>
> - for_each_pipe(display, pipe) {
> + for_each_pipe(&data->display, pipe) {
> igt_output_t *output;
>
> - for_each_valid_output_on_pipe(display, pipe, output) {
> + for_each_valid_output_on_pipe(&data->display, pipe, output) {
> int i;
>
> for (i = pipe - 1; i >= 0; i--)
> @@ -897,7 +933,7 @@ static void run_modeset_transition(igt_display_t
> *display, int requested_outputs
> "Should have at least %i outputs, found %i\n",
> requested_outputs, num_outputs);
>
> - run_modeset_tests(display, requested_outputs, nonblocking, fencing);
> + run_modeset_tests(data, requested_outputs, nonblocking, fencing);
> }
>
> static bool output_is_internal_panel(igt_output_t *output) @@ -913,70
> +949,108 @@ static bool output_is_internal_panel(igt_output_t *output)
> }
> }
>
> -igt_main
> +static int opt_handler(int opt, int opt_index, void *_data) {
> + data_t *data = _data;
> +
> + switch (opt) {
> + case 'e':
> + data->extended = true;
> + break;
> + }
> +
> + return IGT_OPT_HANDLER_SUCCESS;
> +}
> +
> +static const struct option long_opts[] = {
> + { .name = "extended", .has_arg = false, .val = 'e', },
> + {}
> +};
> +
> +static const char help_str[] =
> + " --extended\t\tRun the extended tests\n";
> +
> +static data_t data;
> +
> +igt_main_args("", long_opts, help_str, opt_handler, &data)
> {
> - igt_display_t display;
> igt_output_t *output;
> enum pipe pipe;
> int i, count = 0;
>
> igt_fixture {
> - display.drm_fd = drm_open_driver_master(DRIVER_ANY);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> - igt_display_require(&display, display.drm_fd);
> - igt_require(display.is_atomic);
> + igt_display_require(&data.display, data.drm_fd);
> + igt_require(&data.display.is_atomic);
>
> - igt_display_require_output(&display);
> + igt_display_require_output(&data.display);
>
> - for_each_connected_output(&display, output)
> + for_each_connected_output(&data.display, output)
> count++;
> }
>
> igt_subtest("plane-primary-toggle-with-vblank-wait")
> - for_each_pipe_with_valid_output(&display, pipe, output)
> - run_primary_test(&display, pipe, output);
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> + run_primary_test(&data, pipe, output);
> +
> + }
>
> igt_subtest_with_dynamic("plane-all-transition") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, false, false);
> + run_transition_test(&data, pipe, output,
> TRANSITION_PLANES, false,
> +false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-fencing") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, false, true);
> + run_transition_test(&data, pipe, output,
> TRANSITION_PLANES, false,
> +true);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-nonblocking") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, true, false);
> + run_transition_test(&data, pipe, output,
> TRANSITION_PLANES, true,
> +false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-transition-nonblocking-fencing") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_PLANES, true, true);
> + run_transition_test(&data, pipe, output,
> TRANSITION_PLANES, true,
> +true);
> }
> }
>
> igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_AFTER_FREE, true, false);
> + run_transition_test(&data, pipe, output,
> TRANSITION_AFTER_FREE,
> +true, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind-
> fencing") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_AFTER_FREE, true, true);
> + run_transition_test(&data, pipe, output,
> TRANSITION_AFTER_FREE,
> +true, true);
> }
> }
>
> @@ -986,76 +1060,87 @@ igt_main
> * panels with long power cycle delays.
> */
> igt_subtest_with_dynamic("plane-all-modeset-transition")
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET, false, false);
> + run_transition_test(&data, pipe, output,
> TRANSITION_MODESET, false,
> +false);
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-fencing")
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET, false, true);
> + run_transition_test(&data, pipe, output,
> TRANSITION_MODESET, false,
> +true);
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-internal-
> panels") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (!output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET_FAST, false, false);
> + run_transition_test(&data, pipe, output,
> TRANSITION_MODESET_FAST,
> +false, false);
> }
> }
>
> igt_subtest_with_dynamic("plane-all-modeset-transition-fencing-
> internal-panels") {
> - for_each_pipe_with_valid_output(&display, pipe, output) {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> if (!output_is_internal_panel(output))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output),
> kmstest_pipe_name(pipe))
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET_FAST, false, true);
> + run_transition_test(&data, pipe, output,
> TRANSITION_MODESET_FAST,
> +false, true);
> }
> }
>
> igt_subtest("plane-toggle-modeset-transition")
> - for_each_pipe_with_valid_output(&display, pipe, output)
> - run_transition_test(&display, pipe, output,
> TRANSITION_MODESET_DISABLE, false, false);
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + if (pipe >= 2 && !data.extended)
> + break;
> + run_transition_test(&data, pipe, output,
> TRANSITION_MODESET_DISABLE, false, false);
> + }
>
> igt_subtest_with_dynamic("modeset-transition") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, false, false);
> + run_modeset_transition(&data, i, false, false);
> }
> }
>
> igt_subtest_with_dynamic("modeset-transition-nonblocking") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, true, false);
> + run_modeset_transition(&data, i, true, false);
> }
> }
>
> igt_subtest_with_dynamic("modeset-transition-fencing") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, false, true);
> + run_modeset_transition(&data, i, false, true);
> }
> }
>
> igt_subtest_with_dynamic("modeset-transition-nonblocking-fencing") {
> for (i = 1; i <= count; i++) {
> igt_dynamic_f("%ix-outputs", i)
> - run_modeset_transition(&display, i, true, true);
> + run_modeset_transition(&data, i, true, true);
> }
> }
>
> igt_fixture {
> - igt_display_fini(&display);
> + igt_display_fini(&data.display);
> }
> }
> --
> 2.26.2
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time
@ 2021-01-12 5:49 Nidhi Gupta
2021-01-27 15:42 ` Shankar, Uma
2021-01-28 4:46 ` Karthik B S
0 siblings, 2 replies; 7+ messages in thread
From: Nidhi Gupta @ 2021-01-12 5:49 UTC (permalink / raw)
To: igt-dev; +Cc: Nidhi Gupta, uma.shanker
kms_atomic_transition test is taking minimum of
69.5s time to execute on CI. To reduce the execution
time this patch will add the change which will run
the test on 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane
and skip the rest of the planes.
v4: -restricted execution of all the subtests to
2 pipes. (Uma)
-Modified skip_plane() function. (Uma)
v5: -added a extended flag, if it is set by the user
test will be executed on all the pipes otherwise will be
executed only on 2 pipes. (Karthik)
v6: -in previous version extended flag and display passed in
separate structures now added a data_t structure which includes
igt_display_t, extended flag and drm_fd in single structure. (Uma)
Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com>
---
tests/kms_atomic_transition.c | 403 ++++++++++++++++++++--------------
1 file changed, 244 insertions(+), 159 deletions(-)
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 02206f0a..3c0567fc 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -45,13 +45,19 @@ struct plane_parms {
uint32_t width, height, mask;
};
+typedef struct {
+ int drm_fd;
+ igt_display_t display;
+ bool extended;
+} data_t;
+
/* globals for fence support */
int *timeline;
pthread_t *thread;
int *seqno;
static void
-run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
+run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output)
{
drmModeModeInfo *mode;
igt_plane_t *primary;
@@ -65,34 +71,34 @@ run_primary_test(igt_display_t *display, enum pipe pipe, igt_output_t *output)
mode = igt_output_get_mode(output);
igt_plane_set_fb(primary, NULL);
- ret = igt_display_try_commit_atomic(display, flags, NULL);
+ ret = igt_display_try_commit_atomic(&data->display, flags, NULL);
igt_skip_on_f(ret == -EINVAL, "Primary plane cannot be disabled separately from output\n");
- igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
+ igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb);
igt_plane_set_fb(primary, &fb);
for (i = 0; i < 4; i++) {
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
if (!(i & 1))
- igt_wait_for_vblank(display->drm_fd,
- display->pipes[pipe].crtc_offset);
+ igt_wait_for_vblank(data->drm_fd,
+ data->display.pipes[pipe].crtc_offset);
igt_plane_set_fb(primary, (i & 1) ? &fb : NULL);
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
if (i & 1)
- igt_wait_for_vblank(display->drm_fd,
- display->pipes[pipe].crtc_offset);
+ igt_wait_for_vblank(data->drm_fd,
+ data->display.pipes[pipe].crtc_offset);
igt_plane_set_fb(primary, (i & 1) ? NULL : &fb);
}
igt_plane_set_fb(primary, NULL);
igt_output_set_pipe(output, PIPE_NONE);
- igt_remove_fb(display->drm_fd, &fb);
+ igt_remove_fb(data->drm_fd, &fb);
}
static void *fence_inc_thread(void *arg)
@@ -120,8 +126,35 @@ static void configure_fencing(igt_plane_t *plane)
igt_assert_eq(ret, 0);
}
+static bool skip_plane(data_t *data, igt_plane_t *plane)
+{
+ int index = plane->index;
+
+ if (data->extended)
+ return false;
+
+ if (!is_i915_device(data->drm_fd))
+ return false;
+
+ if (plane->type == DRM_PLANE_TYPE_CURSOR)
+ return false;
+
+ if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
+ return false;
+
+ /*
+ * Test 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane.
+ *
+ * Kernel registers planes in the hardware Z order:
+ * 0,1,2 HDR planes
+ * 3,4 SDR UV planes
+ * 5,6 SDR Y planes
+ */
+ return index != 0 && index != 3 && index != 5;
+}
+
static int
-wm_setup_plane(igt_display_t *display, enum pipe pipe,
+wm_setup_plane(data_t *data, enum pipe pipe,
uint32_t mask, struct plane_parms *parms, bool fencing)
{
igt_plane_t *plane;
@@ -132,9 +165,12 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
* because most of the modeset operations must be fast
* later on.
*/
- for_each_plane_on_pipe(display, pipe, plane) {
+ for_each_plane_on_pipe(&data->display, pipe, plane) {
int i = plane->index;
+ if (skip_plane(data, plane))
+ continue;
+
if (!mask || !(parms[i].mask & mask)) {
if (plane->values[IGT_PLANE_FB_ID]) {
igt_plane_set_fb(plane, NULL);
@@ -173,13 +209,13 @@ enum transition_type {
TRANSITION_MODESET_DISABLE,
};
-static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
+static void set_sprite_wh(data_t *data, enum pipe pipe,
struct plane_parms *parms, struct igt_fb *sprite_fb,
bool alpha, unsigned w, unsigned h)
{
igt_plane_t *plane;
- for_each_plane_on_pipe(display, pipe, plane) {
+ for_each_plane_on_pipe(&data->display, pipe, plane) {
int i = plane->index;
if (plane->type == DRM_PLANE_TYPE_PRIMARY ||
@@ -193,8 +229,8 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
parms[i].height = h;
}
- igt_remove_fb(display->drm_fd, sprite_fb);
- igt_create_fb(display->drm_fd, w, h,
+ igt_remove_fb(data->drm_fd, sprite_fb);
+ igt_create_fb(data->drm_fd, w, h,
alpha ? DRM_FORMAT_ARGB8888 : DRM_FORMAT_XRGB8888,
LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb);
}
@@ -205,7 +241,7 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe,
#define is_atomic_check_plane_size_errno(errno) \
(errno == -EINVAL)
-static void setup_parms(igt_display_t *display, enum pipe pipe,
+static void setup_parms(data_t *data, enum pipe pipe,
const drmModeModeInfo *mode,
struct igt_fb *primary_fb,
struct igt_fb *argb_fb,
@@ -216,20 +252,20 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
uint64_t cursor_width, cursor_height;
unsigned sprite_width, sprite_height, prev_w, prev_h;
bool max_sprite_width, max_sprite_height, alpha = true;
- uint32_t n_planes = display->pipes[pipe].n_planes;
+ uint32_t n_planes = data->display.pipes[pipe].n_planes;
uint32_t n_overlays = 0, overlays[n_planes];
igt_plane_t *plane;
uint32_t iter_mask = 3;
- do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
+ do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
if (cursor_width >= mode->hdisplay)
cursor_width = mode->hdisplay;
- do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height));
+ do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height));
if (cursor_height >= mode->vdisplay)
cursor_height = mode->vdisplay;
- for_each_plane_on_pipe(display, pipe, plane) {
+ for_each_plane_on_pipe(&data->display, pipe, plane) {
int i = plane->index;
if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
@@ -272,10 +308,10 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
}
}
- igt_create_fb(display->drm_fd, cursor_width, cursor_height,
+ igt_create_fb(data->drm_fd, cursor_width, cursor_height,
DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, argb_fb);
- igt_create_fb(display->drm_fd, cursor_width, cursor_height,
+ igt_create_fb(data->drm_fd, cursor_width, cursor_height,
DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb);
*iter_max = iter_mask + 1;
@@ -295,11 +331,11 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
while (!max_sprite_width && !max_sprite_height) {
int ret;
- set_sprite_wh(display, pipe, parms, sprite_fb,
+ set_sprite_wh(data, pipe, parms, sprite_fb,
alpha, sprite_width, sprite_height);
- wm_setup_plane(display, pipe, (1 << n_planes) - 1, parms, false);
- ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ wm_setup_plane(data, pipe, (1 << n_planes) - 1, parms, false);
+ ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
igt_assert(!is_atomic_check_failure_errno(ret));
if (!is_atomic_check_plane_size_errno(ret)) {
@@ -327,7 +363,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
igt_assert_f(n_planes >= 3, "No planes left to proceed with!");
if (n_overlays > 0) {
uint32_t plane_to_remove = hars_petruska_f54_1_random_unsafe_max(n_overlays);
- removed_plane = &display->pipes[pipe].planes[overlays[plane_to_remove]];
+ removed_plane = &data->display.pipes[pipe].planes[overlays[plane_to_remove]];
igt_plane_set_fb(removed_plane, NULL);
while (plane_to_remove < (n_overlays - 1)) {
overlays[plane_to_remove] = overlays[plane_to_remove + 1];
@@ -353,7 +389,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
max_sprite_height = true;
}
- set_sprite_wh(display, pipe, parms, sprite_fb,
+ set_sprite_wh(data, pipe, parms, sprite_fb,
alpha, sprite_width, sprite_height);
igt_info("Running test on pipe %s with resolution %dx%d and sprite size %dx%d alpha %i\n",
@@ -361,14 +397,14 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
sprite_width, sprite_height, alpha);
}
-static void prepare_fencing(igt_display_t *display, enum pipe pipe)
+static void prepare_fencing(data_t *data, enum pipe pipe)
{
igt_plane_t *plane;
int n_planes;
igt_require_sw_sync();
- n_planes = display->pipes[pipe].n_planes;
+ n_planes = data->display.pipes[pipe].n_planes;
timeline = calloc(sizeof(*timeline), n_planes);
igt_assert_f(timeline != NULL, "Failed to allocate memory for timelines\n");
thread = calloc(sizeof(*thread), n_planes);
@@ -376,15 +412,15 @@ static void prepare_fencing(igt_display_t *display, enum pipe pipe)
seqno = calloc(sizeof(*seqno), n_planes);
igt_assert_f(seqno != NULL, "Failed to allocate memory for seqno\n");
- for_each_plane_on_pipe(display, pipe, plane)
+ for_each_plane_on_pipe(&data->display, pipe, plane)
timeline[plane->index] = sw_sync_timeline_create();
}
-static void unprepare_fencing(igt_display_t *display, enum pipe pipe)
+static void unprepare_fencing(data_t *data, enum pipe pipe)
{
igt_plane_t *plane;
- for_each_plane_on_pipe(display, pipe, plane)
+ for_each_plane_on_pipe(&data->display, pipe, plane)
close(timeline[plane->index]);
free(timeline);
@@ -392,12 +428,12 @@ static void unprepare_fencing(igt_display_t *display, enum pipe pipe)
free(seqno);
}
-static void atomic_commit(igt_display_t *display, enum pipe pipe, unsigned int flags, void *data, bool fencing)
+static void atomic_commit(data_t *data_v, enum pipe pipe, unsigned int flags, void *data, bool fencing)
{
if (fencing)
- igt_pipe_request_out_fence(&display->pipes[pipe]);
+ igt_pipe_request_out_fence(&data_v->display.pipes[pipe]);
- igt_display_commit_atomic(display, flags, data);
+ igt_display_commit_atomic(&data_v->display, flags, data);
}
static int fd_completed(int fd)
@@ -410,10 +446,10 @@ static int fd_completed(int fd)
return ret;
}
-static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool nonblocking, bool fencing)
+static void wait_for_transition(data_t *data, enum pipe pipe, bool nonblocking, bool fencing)
{
if (fencing) {
- int fence_fd = display->pipes[pipe].out_fence_fd;
+ int fence_fd = data->display.pipes[pipe].out_fence_fd;
if (!nonblocking)
igt_assert(fd_completed(fence_fd));
@@ -421,9 +457,9 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
igt_assert(sync_fence_wait(fence_fd, 30000) == 0);
} else {
if (!nonblocking)
- igt_assert(fd_completed(display->drm_fd));
+ igt_assert(fd_completed(data->drm_fd));
- drmHandleEvent(display->drm_fd, &drm_events);
+ drmHandleEvent(data->drm_fd, &drm_events);
}
}
@@ -437,20 +473,20 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
* so test this and make sure it works.
*/
static void
-run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output,
+run_transition_test(data_t *data, enum pipe pipe, igt_output_t *output,
enum transition_type type, bool nonblocking, bool fencing)
{
struct igt_fb fb, argb_fb, sprite_fb;
drmModeModeInfo *mode, override_mode;
igt_plane_t *plane;
- igt_pipe_t *pipe_obj = &display->pipes[pipe];
+ igt_pipe_t *pipe_obj = &data->display.pipes[pipe];
uint32_t iter_max, i;
struct plane_parms parms[pipe_obj->n_planes];
unsigned flags = 0;
int ret;
if (fencing)
- prepare_fencing(display, pipe);
+ prepare_fencing(data, pipe);
else
flags |= DRM_MODE_PAGE_FLIP_EVENT;
@@ -465,24 +501,24 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
/* try to force a modeset */
override_mode.flags ^= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NHSYNC;
- igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
+ igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb);
igt_output_set_pipe(output, pipe);
- wm_setup_plane(display, pipe, 0, NULL, false);
+ wm_setup_plane(data, pipe, 0, NULL, false);
if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
igt_output_set_pipe(output, PIPE_NONE);
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
igt_output_set_pipe(output, pipe);
}
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
- setup_parms(display, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);
+ setup_parms(data, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);
/*
* In some configurations the tests may not run to completion with all
@@ -490,19 +526,19 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
* planes to fix this
*/
while (1) {
- wm_setup_plane(display, pipe, iter_max - 1, parms, false);
+ wm_setup_plane(data, pipe, iter_max - 1, parms, false);
if (fencing)
igt_pipe_request_out_fence(pipe_obj);
- ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
igt_assert(!is_atomic_check_failure_errno(ret));
if (!is_atomic_check_plane_size_errno(ret) || pipe_obj->n_planes < 3)
break;
ret = 0;
- for_each_plane_on_pipe(display, pipe, plane) {
+ for_each_plane_on_pipe(&data->display, pipe, plane) {
i = plane->index;
if (plane->type == DRM_PLANE_TYPE_PRIMARY ||
@@ -519,33 +555,33 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
igt_skip("Cannot run tests without proper size sprite planes\n");
}
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
if (type == TRANSITION_AFTER_FREE) {
int fence_fd = -1;
- wm_setup_plane(display, pipe, 0, parms, fencing);
+ wm_setup_plane(data, pipe, 0, parms, fencing);
- atomic_commit(display, pipe, flags, (void *)(unsigned long)0, fencing);
+ atomic_commit(data, pipe, flags, (void *)(unsigned long)0, fencing);
if (fencing) {
fence_fd = pipe_obj->out_fence_fd;
pipe_obj->out_fence_fd = -1;
}
/* force planes to be part of commit */
- for_each_plane_on_pipe(display, pipe, plane) {
+ for_each_plane_on_pipe(&data->display, pipe, plane) {
if (parms[plane->index].mask)
igt_plane_set_position(plane, 0, 0);
}
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
if (fence_fd != -1) {
igt_assert(fd_completed(fence_fd));
close(fence_fd);
} else {
- igt_assert(fd_completed(display->drm_fd));
- wait_for_transition(display, pipe, false, fencing);
+ igt_assert(fd_completed(data->drm_fd));
+ wait_for_transition(data, pipe, false, fencing);
}
goto cleanup;
}
@@ -560,20 +596,20 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
igt_output_set_pipe(output, pipe);
- if (!wm_setup_plane(display, pipe, i, parms, fencing))
+ if (!wm_setup_plane(data, pipe, i, parms, fencing))
continue;
- atomic_commit(display, pipe, flags, (void *)(unsigned long)i, fencing);
- wait_for_transition(display, pipe, nonblocking, fencing);
+ atomic_commit(data, pipe, flags, (void *)(unsigned long)i, fencing);
+ wait_for_transition(data, pipe, nonblocking, fencing);
if (type == TRANSITION_MODESET_DISABLE) {
igt_output_set_pipe(output, PIPE_NONE);
- if (!wm_setup_plane(display, pipe, 0, parms, fencing))
+ if (!wm_setup_plane(data, pipe, 0, parms, fencing))
continue;
- atomic_commit(display, pipe, flags, (void *) 0UL, fencing);
- wait_for_transition(display, pipe, nonblocking, fencing);
+ atomic_commit(data, pipe, flags, (void *) 0UL, fencing);
+ wait_for_transition(data, pipe, nonblocking, fencing);
} else {
uint32_t j;
@@ -586,44 +622,44 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
n_enable_planes < pipe_obj->n_planes)
continue;
- if (!wm_setup_plane(display, pipe, j, parms, fencing))
+ if (!wm_setup_plane(data, pipe, j, parms, fencing))
continue;
if (type >= TRANSITION_MODESET)
igt_output_override_mode(output, &override_mode);
- atomic_commit(display, pipe, flags, (void *)(unsigned long) j, fencing);
- wait_for_transition(display, pipe, nonblocking, fencing);
+ atomic_commit(data, pipe, flags, (void *)(unsigned long) j, fencing);
+ wait_for_transition(data, pipe, nonblocking, fencing);
- if (!wm_setup_plane(display, pipe, i, parms, fencing))
+ if (!wm_setup_plane(data, pipe, i, parms, fencing))
continue;
if (type >= TRANSITION_MODESET)
igt_output_override_mode(output, NULL);
- atomic_commit(display, pipe, flags, (void *)(unsigned long) i, fencing);
- wait_for_transition(display, pipe, nonblocking, fencing);
+ atomic_commit(data, pipe, flags, (void *)(unsigned long) i, fencing);
+ wait_for_transition(data, pipe, nonblocking, fencing);
}
}
}
cleanup:
if (fencing)
- unprepare_fencing(display, pipe);
+ unprepare_fencing(data, pipe);
igt_output_set_pipe(output, PIPE_NONE);
- for_each_plane_on_pipe(display, pipe, plane)
+ for_each_plane_on_pipe(&data->display, pipe, plane)
igt_plane_set_fb(plane, NULL);
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
- igt_remove_fb(display->drm_fd, &fb);
- igt_remove_fb(display->drm_fd, &argb_fb);
- igt_remove_fb(display->drm_fd, &sprite_fb);
+ igt_remove_fb(data->drm_fd, &fb);
+ igt_remove_fb(data->drm_fd, &argb_fb);
+ igt_remove_fb(data->drm_fd, &sprite_fb);
}
-static void commit_display(igt_display_t *display, unsigned event_mask, bool nonblocking)
+static void commit_display(data_t *data, unsigned event_mask, bool nonblocking)
{
unsigned flags;
int num_events = igt_hweight(event_mask);
@@ -633,7 +669,7 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non
if (nonblocking)
flags |= DRM_MODE_ATOMIC_NONBLOCK;
- igt_display_commit_atomic(display, flags, NULL);
+ igt_display_commit_atomic(&data->display, flags, NULL);
igt_debug("Event mask: %x, waiting for %i events\n", event_mask, num_events);
@@ -645,7 +681,7 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non
struct drm_event_vblank *vblank = (void *)buf;
igt_set_timeout(3, "Timed out while reading drm_fd\n");
- ret = read(display->drm_fd, buf, sizeof(buf));
+ ret = read(data->drm_fd, buf, sizeof(buf));
igt_reset_timeout();
if (ret < 0 && (errno == EINTR || errno == EAGAIN))
continue;
@@ -661,23 +697,23 @@ static void commit_display(igt_display_t *display, unsigned event_mask, bool non
igt_reset_timeout();
}
-static unsigned set_combinations(igt_display_t *display, unsigned mask, struct igt_fb *fb)
+static unsigned set_combinations(data_t *data, unsigned mask, struct igt_fb *fb)
{
igt_output_t *output;
enum pipe pipe;
unsigned event_mask = 0;
int i;
- for (i = 0; i < display->n_outputs; i++)
- igt_output_set_pipe(&display->outputs[i], PIPE_NONE);
+ for (i = 0; i < data->display.n_outputs; i++)
+ igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE);
- for_each_pipe(display, pipe) {
- igt_plane_t *plane = igt_pipe_get_plane_type(&display->pipes[pipe],
+ for_each_pipe(&data->display, pipe) {
+ igt_plane_t *plane = igt_pipe_get_plane_type(&data->display.pipes[pipe],
DRM_PLANE_TYPE_PRIMARY);
drmModeModeInfo *mode = NULL;
if (!(mask & (1 << pipe))) {
- if (igt_pipe_is_prop_changed(display, pipe, IGT_CRTC_ACTIVE)) {
+ if (igt_pipe_is_prop_changed(&data->display, pipe, IGT_CRTC_ACTIVE)) {
event_mask |= 1 << pipe;
igt_plane_set_fb(plane, NULL);
}
@@ -687,7 +723,7 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i
event_mask |= 1 << pipe;
- for_each_valid_output_on_pipe(display, pipe, output) {
+ for_each_valid_output_on_pipe(&data->display, pipe, output) {
if (output->pending_pipe != PIPE_NONE)
continue;
@@ -707,16 +743,16 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i
return event_mask;
}
-static void refresh_primaries(igt_display_t *display, int mask)
+static void refresh_primaries(data_t *data, int mask)
{
enum pipe pipe;
igt_plane_t *plane;
- for_each_pipe(display, pipe) {
+ for_each_pipe(&data->display, pipe) {
if (!((1 << pipe) & mask))
continue;
- for_each_plane_on_pipe(display, pipe, plane)
+ for_each_plane_on_pipe(&data->display, pipe, plane)
if (plane->type == DRM_PLANE_TYPE_PRIMARY)
igt_plane_set_position(plane, 0, 0);
}
@@ -737,7 +773,7 @@ static void collect_crcs_mask(igt_pipe_crc_t **pipe_crcs, unsigned mask, igt_crc
}
}
-static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblocking, bool fencing)
+static void run_modeset_tests(data_t *data, int howmany, bool nonblocking, bool fencing)
{
struct igt_fb fbs[2];
int i, j = 0;
@@ -746,33 +782,33 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
igt_output_t *output;
unsigned width = 0, height = 0;
- for (i = 0; i < display->n_outputs; i++)
- igt_output_set_pipe(&display->outputs[i], PIPE_NONE);
+ for (i = 0; i < data->display.n_outputs; i++)
+ igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE);
- for_each_connected_output(display, output) {
+ for_each_connected_output(&data->display, output) {
drmModeModeInfo *mode = igt_output_get_mode(output);
width = max(width, mode->hdisplay);
height = max(height, mode->vdisplay);
}
- igt_create_pattern_fb(display->drm_fd, width, height,
+ igt_create_pattern_fb(data->drm_fd, width, height,
DRM_FORMAT_XRGB8888, 0, &fbs[0]);
- igt_create_color_pattern_fb(display->drm_fd, width, height,
+ igt_create_color_pattern_fb(data->drm_fd, width, height,
DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &fbs[1]);
- for_each_pipe(display, i) {
- igt_pipe_t *pipe = &display->pipes[i];
+ for_each_pipe(&data->display, i) {
+ igt_pipe_t *pipe = &data->display.pipes[i];
igt_plane_t *plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
drmModeModeInfo *mode = NULL;
/* count enable pipes to set max iteration */
j += 1;
- if (is_i915_device(display->drm_fd))
- pipe_crcs[i] = igt_pipe_crc_new(display->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO);
+ if (is_i915_device(data->drm_fd))
+ pipe_crcs[i] = igt_pipe_crc_new(data->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO);
- for_each_valid_output_on_pipe(display, i, output) {
+ for_each_valid_output_on_pipe(&data->display, i, output) {
if (output->pending_pipe != PIPE_NONE)
continue;
@@ -787,7 +823,7 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
if (fencing)
- igt_pipe_request_out_fence(&display->pipes[i]);
+ igt_pipe_request_out_fence(&data->display.pipes[i]);
} else {
igt_plane_set_fb(plane, NULL);
}
@@ -795,7 +831,7 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
iter_max = 1 << j;
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
for (i = 0; i < iter_max; i++) {
igt_crc_t crcs[5][IGT_MAX_PIPES];
@@ -804,11 +840,11 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
if (igt_hweight(i) > howmany)
continue;
- event_mask = set_combinations(display, i, &fbs[0]);
+ event_mask = set_combinations(data, i, &fbs[0]);
if (!event_mask && i)
continue;
- commit_display(display, event_mask, nonblocking);
+ commit_display(data, event_mask, nonblocking);
collect_crcs_mask(pipe_crcs, i, crcs[0]);
@@ -819,30 +855,30 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
if (igt_hweight(i) < howmany && igt_hweight(j) < howmany)
continue;
- event_mask = set_combinations(display, j, &fbs[1]);
+ event_mask = set_combinations(data, j, &fbs[1]);
if (!event_mask)
continue;
- commit_display(display, event_mask, nonblocking);
+ commit_display(data, event_mask, nonblocking);
collect_crcs_mask(pipe_crcs, j, crcs[1]);
- refresh_primaries(display, j);
- commit_display(display, j, nonblocking);
+ refresh_primaries(data, j);
+ commit_display(data, j, nonblocking);
collect_crcs_mask(pipe_crcs, j, crcs[2]);
- event_mask = set_combinations(display, i, &fbs[0]);
+ event_mask = set_combinations(data, i, &fbs[0]);
if (!event_mask)
continue;
- commit_display(display, event_mask, nonblocking);
+ commit_display(data, event_mask, nonblocking);
collect_crcs_mask(pipe_crcs, i, crcs[3]);
- refresh_primaries(display, i);
- commit_display(display, i, nonblocking);
+ refresh_primaries(data, i);
+ commit_display(data, i, nonblocking);
collect_crcs_mask(pipe_crcs, i, crcs[4]);
- if (!is_i915_device(display->drm_fd))
+ if (!is_i915_device(data->drm_fd))
continue;
for (int k = 0; k < IGT_MAX_PIPES; k++) {
@@ -857,28 +893,28 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
}
}
- set_combinations(display, 0, NULL);
- igt_display_commit2(display, COMMIT_ATOMIC);
+ set_combinations(data, 0, NULL);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
- if (is_i915_device(display->drm_fd)) {
- for_each_pipe(display, i)
+ if (is_i915_device(data->drm_fd)) {
+ for_each_pipe(&data->display, i)
igt_pipe_crc_free(pipe_crcs[i]);
}
- igt_remove_fb(display->drm_fd, &fbs[1]);
- igt_remove_fb(display->drm_fd, &fbs[0]);
+ igt_remove_fb(data->drm_fd, &fbs[1]);
+ igt_remove_fb(data->drm_fd, &fbs[0]);
}
-static void run_modeset_transition(igt_display_t *display, int requested_outputs, bool nonblocking, bool fencing)
+static void run_modeset_transition(data_t *data, int requested_outputs, bool nonblocking, bool fencing)
{
igt_output_t *outputs[IGT_MAX_PIPES] = {};
int num_outputs = 0;
enum pipe pipe;
- for_each_pipe(display, pipe) {
+ for_each_pipe(&data->display, pipe) {
igt_output_t *output;
- for_each_valid_output_on_pipe(display, pipe, output) {
+ for_each_valid_output_on_pipe(&data->display, pipe, output) {
int i;
for (i = pipe - 1; i >= 0; i--)
@@ -897,7 +933,7 @@ static void run_modeset_transition(igt_display_t *display, int requested_outputs
"Should have at least %i outputs, found %i\n",
requested_outputs, num_outputs);
- run_modeset_tests(display, requested_outputs, nonblocking, fencing);
+ run_modeset_tests(data, requested_outputs, nonblocking, fencing);
}
static bool output_is_internal_panel(igt_output_t *output)
@@ -913,70 +949,108 @@ static bool output_is_internal_panel(igt_output_t *output)
}
}
-igt_main
+static int opt_handler(int opt, int opt_index, void *_data)
+{
+ data_t *data = _data;
+
+ switch (opt) {
+ case 'e':
+ data->extended = true;
+ break;
+ }
+
+ return IGT_OPT_HANDLER_SUCCESS;
+}
+
+static const struct option long_opts[] = {
+ { .name = "extended", .has_arg = false, .val = 'e', },
+ {}
+};
+
+static const char help_str[] =
+ " --extended\t\tRun the extended tests\n";
+
+static data_t data;
+
+igt_main_args("", long_opts, help_str, opt_handler, &data)
{
- igt_display_t display;
igt_output_t *output;
enum pipe pipe;
int i, count = 0;
igt_fixture {
- display.drm_fd = drm_open_driver_master(DRIVER_ANY);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
- igt_display_require(&display, display.drm_fd);
- igt_require(display.is_atomic);
+ igt_display_require(&data.display, data.drm_fd);
+ igt_require(&data.display.is_atomic);
- igt_display_require_output(&display);
+ igt_display_require_output(&data.display);
- for_each_connected_output(&display, output)
+ for_each_connected_output(&data.display, output)
count++;
}
igt_subtest("plane-primary-toggle-with-vblank-wait")
- for_each_pipe_with_valid_output(&display, pipe, output)
- run_primary_test(&display, pipe, output);
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
+ run_primary_test(&data, pipe, output);
+
+ }
igt_subtest_with_dynamic("plane-all-transition") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, false);
+ run_transition_test(&data, pipe, output, TRANSITION_PLANES, false, false);
}
}
igt_subtest_with_dynamic("plane-all-transition-fencing") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, true);
+ run_transition_test(&data, pipe, output, TRANSITION_PLANES, false, true);
}
}
igt_subtest_with_dynamic("plane-all-transition-nonblocking") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, true, false);
+ run_transition_test(&data, pipe, output, TRANSITION_PLANES, true, false);
}
}
igt_subtest_with_dynamic("plane-all-transition-nonblocking-fencing") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_PLANES, true, true);
+ run_transition_test(&data, pipe, output, TRANSITION_PLANES, true, true);
}
}
igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_AFTER_FREE, true, false);
+ run_transition_test(&data, pipe, output, TRANSITION_AFTER_FREE, true, false);
}
}
igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind-fencing") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_AFTER_FREE, true, true);
+ run_transition_test(&data, pipe, output, TRANSITION_AFTER_FREE, true, true);
}
}
@@ -986,76 +1060,87 @@ igt_main
* panels with long power cycle delays.
*/
igt_subtest_with_dynamic("plane-all-modeset-transition")
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET, false, false);
+ run_transition_test(&data, pipe, output, TRANSITION_MODESET, false, false);
}
igt_subtest_with_dynamic("plane-all-modeset-transition-fencing")
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET, false, true);
+ run_transition_test(&data, pipe, output, TRANSITION_MODESET, false, true);
}
igt_subtest_with_dynamic("plane-all-modeset-transition-internal-panels") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (!output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET_FAST, false, false);
+ run_transition_test(&data, pipe, output, TRANSITION_MODESET_FAST, false, false);
}
}
igt_subtest_with_dynamic("plane-all-modeset-transition-fencing-internal-panels") {
- for_each_pipe_with_valid_output(&display, pipe, output) {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
if (!output_is_internal_panel(output))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
- run_transition_test(&display, pipe, output, TRANSITION_MODESET_FAST, false, true);
+ run_transition_test(&data, pipe, output, TRANSITION_MODESET_FAST, false, true);
}
}
igt_subtest("plane-toggle-modeset-transition")
- for_each_pipe_with_valid_output(&display, pipe, output)
- run_transition_test(&display, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ if (pipe >= 2 && !data.extended)
+ break;
+ run_transition_test(&data, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
+ }
igt_subtest_with_dynamic("modeset-transition") {
for (i = 1; i <= count; i++) {
igt_dynamic_f("%ix-outputs", i)
- run_modeset_transition(&display, i, false, false);
+ run_modeset_transition(&data, i, false, false);
}
}
igt_subtest_with_dynamic("modeset-transition-nonblocking") {
for (i = 1; i <= count; i++) {
igt_dynamic_f("%ix-outputs", i)
- run_modeset_transition(&display, i, true, false);
+ run_modeset_transition(&data, i, true, false);
}
}
igt_subtest_with_dynamic("modeset-transition-fencing") {
for (i = 1; i <= count; i++) {
igt_dynamic_f("%ix-outputs", i)
- run_modeset_transition(&display, i, false, true);
+ run_modeset_transition(&data, i, false, true);
}
}
igt_subtest_with_dynamic("modeset-transition-nonblocking-fencing") {
for (i = 1; i <= count; i++) {
igt_dynamic_f("%ix-outputs", i)
- run_modeset_transition(&display, i, true, true);
+ run_modeset_transition(&data, i, true, true);
}
}
igt_fixture {
- igt_display_fini(&display);
+ igt_display_fini(&data.display);
}
}
--
2.26.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-28 4:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-05 11:08 [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Nidhi Gupta
2021-01-05 11:53 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_atomic_transition:reduce execution time (rev6) Patchwork
2021-01-05 14:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-07 12:06 ` [igt-dev] [PATCH i-g-t v6] tests/kms_atomic_transition:reduce execution time Shankar, Uma
2021-01-12 5:49 Nidhi Gupta
2021-01-27 15:42 ` Shankar, Uma
2021-01-28 4:46 ` Karthik B S
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.