* [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner
@ 2020-09-17 11:03 Karthik B S
2020-09-17 12:21 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_big_joiner: Add test to validate big joiner (rev2) Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Karthik B S @ 2020-09-17 11:03 UTC (permalink / raw)
To: igt-dev
Added negative test to verify the different scenarios for big joiner.
In the test, modeset is done on Pipe A for a big joiner mode and
a second modeset is attempted on Pipe B which is expected to fail.
Same functionality is validated for other pipes as well.
Secondly, the reverse is tested where a modeset is done on Pipe B
and then a second big joiner modeset is attempted on Pipe A which is
expected to fail. Same functionality is validated for other pipes as well.
v2: -Rename HDISPLAY_5K to MAX_HDISPLAY_PER_PIPE. (Manasi)
-Do not assume mode[0] will be the highest mode.
Loop through the mode list to find the 8k mode. (Manasi)
-Add a subtest for verifying basic 8k modeset on all pipes. (Manasi)
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
---
tests/Makefile.sources | 1 +
tests/kms_big_joiner.c | 251 +++++++++++++++++++++++++++++++++++++++++
tests/meson.build | 1 +
3 files changed, 253 insertions(+)
create mode 100644 tests/kms_big_joiner.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 6ae95155..ceec6274 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -37,6 +37,7 @@ TESTS_progs = \
kms_atomic_transition \
kms_available_modes_crc \
kms_big_fb \
+ kms_big_joiner \
kms_busy \
kms_ccs \
kms_concurrent \
diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
new file mode 100644
index 00000000..d14ba96b
--- /dev/null
+++ b/tests/kms_big_joiner.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright © 2020 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Author:
+ * Karthik B S <karthik.b.s@intel.com>
+ */
+
+#include "igt.h"
+
+#define MAX_HDISPLAY_PER_PIPE 5120
+
+IGT_TEST_DESCRIPTION("Test big joiner");
+
+typedef struct {
+ int drm_fd;
+ igt_display_t display;
+ struct igt_fb fb;
+ int mode_number;
+ int n_pipes;
+ uint32_t big_joiner_output_id;
+} data_t;
+
+static void test_invalid_modeset(data_t *data)
+{
+ drmModeModeInfo *mode;
+ igt_display_t *display = &data->display;
+ igt_output_t *output, *big_joiner_output = NULL, *second_output = NULL;
+ int width = 0, height = 0, i, ret;
+ igt_pipe_t *pipe;
+ igt_plane_t *plane;
+
+ for_each_connected_output(display, output) {
+ mode = &output->config.connector->modes[0];
+
+ if (data->big_joiner_output_id == output->id) {
+ mode = &output->config.connector->modes[data->mode_number];
+ big_joiner_output = output;
+ } else if (second_output == NULL) {
+ second_output = output;
+ }
+
+ width = max(width, mode->hdisplay);
+ height = max(height, mode->vdisplay);
+
+ igt_output_set_pipe(output, PIPE_NONE);
+ }
+
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+
+ igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
+ LOCAL_DRM_FORMAT_MOD_NONE, &data->fb);
+
+ for_each_pipe(display, i) {
+ if (i < (data->n_pipes - 1)) {
+ igt_output_set_pipe(big_joiner_output, i);
+
+ mode = &big_joiner_output->config.connector->modes[data->mode_number];
+ igt_output_override_mode(big_joiner_output, mode);
+
+ pipe = &display->pipes[i];
+ plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+
+ igt_plane_set_fb(plane, &data->fb);
+ igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
+ igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
+
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+
+ igt_output_set_pipe(second_output, i + 1);
+
+ mode = igt_output_get_mode(second_output);
+
+ pipe = &display->pipes[i + 1];
+ plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+
+ igt_plane_set_fb(plane, &data->fb);
+ igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
+ igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
+
+ /* This commit is expectd to fail as this pipe is being used for big joiner */
+ ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY |
+ DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ igt_assert_lt(ret, 0);
+
+ igt_output_set_pipe(big_joiner_output, PIPE_NONE);
+ igt_output_set_pipe(second_output, PIPE_NONE);
+ igt_plane_set_fb(plane, NULL);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+ }
+ }
+
+ for_each_pipe(display, i) {
+ if (i < (data->n_pipes - 1)) {
+ igt_output_set_pipe(second_output, i + 1);
+
+ mode = igt_output_get_mode(second_output);
+
+ pipe = &display->pipes[i + 1];
+ plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+
+ igt_plane_set_fb(plane, &data->fb);
+ igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
+ igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
+
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+
+ igt_output_set_pipe(big_joiner_output, i);
+
+ mode = &big_joiner_output->config.connector->modes[0];
+
+ pipe = &display->pipes[i];
+ plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+
+ igt_plane_set_fb(plane, &data->fb);
+ igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
+ igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
+
+ /* This commit is expected to fail as the adjacent pipe is already in use*/
+ ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY |
+ DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ igt_assert_lt(ret, 0);
+
+ igt_output_set_pipe(big_joiner_output, PIPE_NONE);
+ igt_output_set_pipe(second_output, PIPE_NONE);
+ igt_plane_set_fb(plane, NULL);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+ }
+ }
+
+ igt_remove_fb(data->drm_fd, &data->fb);
+}
+
+static void test_basic_modeset(data_t *data)
+{
+ drmModeModeInfo *mode;
+ igt_output_t *output, *big_joiner_output = NULL;
+ igt_display_t *display = &data->display;
+ int width = 0, height = 0, i;
+ igt_pipe_t *pipe;
+ igt_plane_t *plane;
+
+ for_each_connected_output(display, output) {
+ if (data->big_joiner_output_id == output->id) {
+ mode = &output->config.connector->modes[data->mode_number];
+ big_joiner_output = output;
+ width = mode->hdisplay;
+ height = mode->vdisplay;
+ }
+
+ igt_output_set_pipe(output, PIPE_NONE);
+ }
+
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+
+ igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
+ LOCAL_DRM_FORMAT_MOD_NONE, &data->fb);
+
+ for_each_pipe(display, i) {
+ if (i < (data->n_pipes - 1)) {
+ igt_output_set_pipe(big_joiner_output, i);
+
+ mode = &big_joiner_output->config.connector->modes[data->mode_number];
+ igt_output_override_mode(big_joiner_output, mode);
+
+ pipe = &display->pipes[i];
+ plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+
+ igt_plane_set_fb(plane, &data->fb);
+ igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
+ igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
+
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+
+ igt_output_set_pipe(big_joiner_output, PIPE_NONE);
+ igt_plane_set_fb(plane, NULL);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+ }
+ }
+
+ igt_remove_fb(data->drm_fd, &data->fb);
+}
+
+igt_main
+{
+ data_t data;
+ bool big_joiner_mode_found = false;
+ igt_output_t *output;
+ drmModeModeInfo *mode;
+ int valid_output = 0, i;
+
+ igt_fixture {
+ data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ kmstest_set_vt_graphics_mode();
+
+ igt_display_require(&data.display, data.drm_fd);
+
+ for_each_connected_output(&data.display, output) {
+ if (!big_joiner_mode_found) {
+ for (i = 0; i < output->config.connector->count_modes; i++) {
+ mode = &output->config.connector->modes[i];
+ if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
+ big_joiner_mode_found = true;
+ data.mode_number = i;
+ data.big_joiner_output_id = output->id;
+ break;
+ }
+ }
+ }
+ valid_output++;
+ }
+
+ data.n_pipes = 0;
+ for_each_pipe(&data.display, i)
+ data.n_pipes++;
+
+ igt_require_f(big_joiner_mode_found, "No output with 5k+ mode found\n");
+ }
+
+ igt_describe("Verify the basic modeset on big joiner mode on all pipes");
+ igt_subtest("basic")
+ test_basic_modeset(&data);
+
+ igt_describe("Verify if the modeset on the adjoining pipe is rejected "
+ "when the pipe is active with a big joiner modeset");
+ igt_subtest("invalid-modeset") {
+ igt_require_f(valid_output > 1, "No valid Second output found\n");
+ test_invalid_modeset(&data);
+ }
+
+ igt_fixture
+ igt_display_fini(&data.display);
+}
diff --git a/tests/meson.build b/tests/meson.build
index 5eb2d2fc..42433424 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -21,6 +21,7 @@ test_progs = [
'kms_atomic_transition',
'kms_available_modes_crc',
'kms_big_fb',
+ 'kms_big_joiner' ,
'kms_busy',
'kms_ccs',
'kms_concurrent',
--
2.22.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_big_joiner: Add test to validate big joiner (rev2)
2020-09-17 11:03 [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Karthik B S
@ 2020-09-17 12:21 ` Patchwork
2020-09-17 13:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2020-09-18 23:30 ` [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Navare, Manasi
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-09-17 12:21 UTC (permalink / raw)
To: Karthik B S; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 6670 bytes --]
== Series Details ==
Series: tests/kms_big_joiner: Add test to validate big joiner (rev2)
URL : https://patchwork.freedesktop.org/series/78769/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9022 -> IGTPW_4994
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/index.html
Known issues
------------
Here are the changes found in IGTPW_4994 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@create-fd-close:
- fi-byt-j1900: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-byt-j1900/igt@gem_basic@create-fd-close.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-byt-j1900/igt@gem_basic@create-fd-close.html
* igt@i915_module_load@reload:
- fi-apl-guc: [PASS][3] -> [DMESG-WARN][4] ([i915#1635] / [i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-apl-guc/igt@i915_module_load@reload.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-apl-guc/igt@i915_module_load@reload.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-bsw-kefka/igt@i915_pm_rpm@basic-pci-d3-state.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-bsw-kefka/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-icl-u2: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html
* igt@vgem_basic@unload:
- fi-skl-guc: [PASS][9] -> [DMESG-WARN][10] ([i915#2203])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-skl-guc/igt@vgem_basic@unload.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-skl-guc/igt@vgem_basic@unload.html
#### Possible fixes ####
* igt@i915_module_load@reload:
- {fi-ehl-1}: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-ehl-1/igt@i915_module_load@reload.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-ehl-1/igt@i915_module_load@reload.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [DMESG-WARN][13] ([i915#1982]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1:
- fi-icl-u2: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1.html
* igt@vgem_basic@unload:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-kbl-x1275/igt@vgem_basic@unload.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-kbl-x1275/igt@vgem_basic@unload.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][19] ([i915#62] / [i915#92]) -> [DMESG-WARN][20] ([i915#62] / [i915#92] / [i915#95]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-kbl-x1275/igt@gem_exec_suspend@basic-s0.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-kbl-x1275/igt@gem_exec_suspend@basic-s0.html
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [DMESG-FAIL][21] ([i915#62]) -> [DMESG-FAIL][22] ([i915#62] / [i915#95])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html
- fi-kbl-guc: [DMESG-WARN][23] ([i915#2203]) -> [DMESG-FAIL][24] ([i915#2203])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-kbl-x1275: [DMESG-WARN][25] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][26] ([i915#62] / [i915#92]) +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/fi-kbl-x1275/igt@kms_cursor_legacy@basic-flip-before-cursor-atomic.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/fi-kbl-x1275/igt@kms_cursor_legacy@basic-flip-before-cursor-atomic.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (45 -> 38)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5787 -> IGTPW_4994
CI-20190529: 20190529
CI_DRM_9022: 98f98783862873daf2a42c874adfa770f08e6b36 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4994: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/index.html
IGT_5787: 0ec962017c8131de14e0cb038f7f76b1f17ed637 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Testlist changes ==
+igt@kms_big_joiner@basic
+igt@kms_big_joiner@invalid-modeset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/index.html
[-- Attachment #1.2: Type: text/html, Size: 8840 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] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for tests/kms_big_joiner: Add test to validate big joiner (rev2)
2020-09-17 11:03 [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Karthik B S
2020-09-17 12:21 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_big_joiner: Add test to validate big joiner (rev2) Patchwork
@ 2020-09-17 13:39 ` Patchwork
2020-09-18 23:30 ` [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Navare, Manasi
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-09-17 13:39 UTC (permalink / raw)
To: Karthik B S; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 11560 bytes --]
== Series Details ==
Series: tests/kms_big_joiner: Add test to validate big joiner (rev2)
URL : https://patchwork.freedesktop.org/series/78769/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9022_full -> IGTPW_4994_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_4994_full:
### IGT changes ###
#### Possible regressions ####
* {igt@kms_big_joiner@basic} (NEW):
- shard-tglb: NOTRUN -> [SKIP][1] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-tglb2/igt@kms_big_joiner@basic.html
- shard-iclb: NOTRUN -> [SKIP][2] +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-iclb4/igt@kms_big_joiner@basic.html
New tests
---------
New tests have been introduced between CI_DRM_9022_full and IGTPW_4994_full:
### New IGT tests (3) ###
* igt@api_intel_bb@render:
- Statuses :
- Exec time: [None] s
* igt@kms_big_joiner@basic:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@kms_big_joiner@invalid-modeset:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in IGTPW_4994_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [PASS][3] -> [DMESG-WARN][4] ([i915#180]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-kbl4/igt@gem_ctx_isolation@preservation-s3@bcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-kbl6/igt@gem_ctx_isolation@preservation-s3@bcs0.html
* igt@gem_exec_nop@basic-sequential:
- shard-glk: [PASS][5] -> [DMESG-WARN][6] ([i915#118] / [i915#95])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-glk8/igt@gem_exec_nop@basic-sequential.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-glk5/igt@gem_exec_nop@basic-sequential.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-apl: [PASS][7] -> [FAIL][8] ([i915#1635] / [i915#2389])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-apl6/igt@gem_exec_reloc@basic-many-active@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-apl6/igt@gem_exec_reloc@basic-many-active@rcs0.html
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2389])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-glk6/igt@gem_exec_reloc@basic-many-active@rcs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-glk5/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@kms_flip@2x-plain-flip-ts-check@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][11] -> [FAIL][12] ([i915#2122])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-glk8/igt@kms_flip@2x-plain-flip-ts-check@bc-hdmi-a1-hdmi-a2.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-glk1/igt@kms_flip@2x-plain-flip-ts-check@bc-hdmi-a1-hdmi-a2.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move:
- shard-glk: [PASS][13] -> [FAIL][14] ([i915#49])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-glk8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-glk9/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt:
- shard-tglb: [PASS][15] -> [DMESG-WARN][16] ([i915#1982]) +4 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt.html
* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#247])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-glk3/igt@kms_plane@plane-position-covered-pipe-b-planes.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-glk9/igt@kms_plane@plane-position-covered-pipe-b-planes.html
- shard-apl: [PASS][19] -> [FAIL][20] ([i915#1635] / [i915#247])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-apl7/igt@kms_plane@plane-position-covered-pipe-b-planes.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-apl8/igt@kms_plane@plane-position-covered-pipe-b-planes.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-iclb5/igt@kms_psr@psr2_primary_page_flip.html
* igt@perf@polling-parameterized:
- shard-apl: [PASS][23] -> [FAIL][24] ([i915#1542] / [i915#1635])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-apl4/igt@perf@polling-parameterized.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-apl7/igt@perf@polling-parameterized.html
#### Possible fixes ####
* igt@gem_ctx_persistence@engines-mixed-process@vcs1:
- shard-tglb: [FAIL][25] ([i915#2374]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-tglb2/igt@gem_ctx_persistence@engines-mixed-process@vcs1.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-tglb7/igt@gem_ctx_persistence@engines-mixed-process@vcs1.html
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][27] ([i915#2389]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-glk6/igt@gem_exec_reloc@basic-many-active@vecs0.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-glk5/igt@gem_exec_reloc@basic-many-active@vecs0.html
* igt@gen9_exec_parse@allowed-all:
- shard-kbl: [INCOMPLETE][29] ([i915#1436]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-kbl4/igt@gen9_exec_parse@allowed-all.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-kbl1/igt@gen9_exec_parse@allowed-all.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][31] ([i915#1899]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-iclb1/igt@i915_pm_dc@dc6-psr.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-iclb3/igt@i915_pm_dc@dc6-psr.html
* igt@i915_pm_rpm@gem-mmap-type@uc:
- shard-iclb: [DMESG-WARN][33] ([i915#1982]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-iclb1/igt@i915_pm_rpm@gem-mmap-type@uc.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-iclb8/igt@i915_pm_rpm@gem-mmap-type@uc.html
* igt@kms_cursor_legacy@2x-cursor-vs-flip-atomic:
- shard-hsw: [INCOMPLETE][35] ([CI#80]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-hsw8/igt@kms_cursor_legacy@2x-cursor-vs-flip-atomic.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-hsw8/igt@kms_cursor_legacy@2x-cursor-vs-flip-atomic.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [FAIL][37] ([i915#96]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
* igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1:
- shard-hsw: [INCOMPLETE][39] ([i915#2055]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-hsw2/igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-hsw7/igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1.html
* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [DMESG-WARN][41] ([i915#180]) -> [PASS][42] +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-kbl1/igt@kms_flip@flip-vs-suspend@c-dp1.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-kbl4/igt@kms_flip@flip-vs-suspend@c-dp1.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][43] ([fdo#109441]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-iclb6/igt@kms_psr@psr2_cursor_render.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_universal_plane@universal-plane-gen9-features-pipe-b:
- shard-tglb: [DMESG-WARN][45] ([i915#1982]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9022/shard-tglb7/igt@kms_universal_plane@universal-plane-gen9-features-pipe-b.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/shard-tglb2/igt@kms_universal_plane@universal-plane-gen9-features-pipe-b.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[CI#80]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/80
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1899]: https://gitlab.freedesktop.org/drm/intel/issues/1899
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2374]: https://gitlab.freedesktop.org/drm/intel/issues/2374
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#247]: https://gitlab.freedesktop.org/drm/intel/issues/247
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (11 -> 8)
------------------------------
Missing (3): pig-skl-6260u pig-glk-j5005 pig-icl-1065g7
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5787 -> IGTPW_4994
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_9022: 98f98783862873daf2a42c874adfa770f08e6b36 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4994: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4994/index.html
IGT_5787: 0ec962017c8131de14e0cb038f7f76b1f17ed637 @ 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_4994/index.html
[-- Attachment #1.2: Type: text/html, Size: 13468 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] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner
2020-09-17 11:03 [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Karthik B S
2020-09-17 12:21 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_big_joiner: Add test to validate big joiner (rev2) Patchwork
2020-09-17 13:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2020-09-18 23:30 ` Navare, Manasi
2020-10-01 7:45 ` Karthik B S
2 siblings, 1 reply; 5+ messages in thread
From: Navare, Manasi @ 2020-09-18 23:30 UTC (permalink / raw)
To: Karthik B S; +Cc: igt-dev
On Thu, Sep 17, 2020 at 04:33:47PM +0530, Karthik B S wrote:
> Added negative test to verify the different scenarios for big joiner.
> In the test, modeset is done on Pipe A for a big joiner mode and
> a second modeset is attempted on Pipe B which is expected to fail.
> Same functionality is validated for other pipes as well.
>
> Secondly, the reverse is tested where a modeset is done on Pipe B
> and then a second big joiner modeset is attempted on Pipe A which is
> expected to fail. Same functionality is validated for other pipes as well.
>
> v2: -Rename HDISPLAY_5K to MAX_HDISPLAY_PER_PIPE. (Manasi)
> -Do not assume mode[0] will be the highest mode.
> Loop through the mode list to find the 8k mode. (Manasi)
> -Add a subtest for verifying basic 8k modeset on all pipes. (Manasi)
>
> Signed-off-by: Karthik B S <karthik.b.s@intel.com>
> ---
> tests/Makefile.sources | 1 +
> tests/kms_big_joiner.c | 251 +++++++++++++++++++++++++++++++++++++++++
> tests/meson.build | 1 +
> 3 files changed, 253 insertions(+)
> create mode 100644 tests/kms_big_joiner.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 6ae95155..ceec6274 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -37,6 +37,7 @@ TESTS_progs = \
> kms_atomic_transition \
> kms_available_modes_crc \
> kms_big_fb \
> + kms_big_joiner \
> kms_busy \
> kms_ccs \
> kms_concurrent \
> diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
> new file mode 100644
> index 00000000..d14ba96b
> --- /dev/null
> +++ b/tests/kms_big_joiner.c
> @@ -0,0 +1,251 @@
> +/*
> + * Copyright © 2020 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + * Author:
> + * Karthik B S <karthik.b.s@intel.com>
> + */
> +
> +#include "igt.h"
> +
> +#define MAX_HDISPLAY_PER_PIPE 5120
> +
> +IGT_TEST_DESCRIPTION("Test big joiner");
> +
> +typedef struct {
> + int drm_fd;
> + igt_display_t display;
> + struct igt_fb fb;
> + int mode_number;
> + int n_pipes;
> + uint32_t big_joiner_output_id;
> +} data_t;
> +
> +static void test_invalid_modeset(data_t *data)
> +{
> + drmModeModeInfo *mode;
> + igt_display_t *display = &data->display;
> + igt_output_t *output, *big_joiner_output = NULL, *second_output = NULL;
> + int width = 0, height = 0, i, ret;
> + igt_pipe_t *pipe;
> + igt_plane_t *plane;
> +
> + for_each_connected_output(display, output) {
> + mode = &output->config.connector->modes[0];
> +
> + if (data->big_joiner_output_id == output->id) {
> + mode = &output->config.connector->modes[data->mode_number];
> + big_joiner_output = output;
> + } else if (second_output == NULL) {
> + second_output = output;
> + }
> +
> + width = max(width, mode->hdisplay);
> + height = max(height, mode->vdisplay);
> +
> + igt_output_set_pipe(output, PIPE_NONE);
> + }
> +
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> +
> + igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
> + LOCAL_DRM_FORMAT_MOD_NONE, &data->fb);
> +
> + for_each_pipe(display, i) {
> + if (i < (data->n_pipes - 1)) {
> + igt_output_set_pipe(big_joiner_output, i);
> +
> + mode = &big_joiner_output->config.connector->modes[data->mode_number];
> + igt_output_override_mode(big_joiner_output, mode);
> +
> + pipe = &display->pipes[i];
> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> +
> + igt_plane_set_fb(plane, &data->fb);
> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
> +
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> +
> + igt_output_set_pipe(second_output, i + 1);
> +
> + mode = igt_output_get_mode(second_output);
> +
> + pipe = &display->pipes[i + 1];
> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> +
> + igt_plane_set_fb(plane, &data->fb);
> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
> +
> + /* This commit is expectd to fail as this pipe is being used for big joiner */
> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY |
> + DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + igt_assert_lt(ret, 0);
> +
> + igt_output_set_pipe(big_joiner_output, PIPE_NONE);
> + igt_output_set_pipe(second_output, PIPE_NONE);
> + igt_plane_set_fb(plane, NULL);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> + }
> + }
> +
> + for_each_pipe(display, i) {
> + if (i < (data->n_pipes - 1)) {
> + igt_output_set_pipe(second_output, i + 1);
> +
> + mode = igt_output_get_mode(second_output);
> +
> + pipe = &display->pipes[i + 1];
> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> +
> + igt_plane_set_fb(plane, &data->fb);
> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
> +
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> +
> + igt_output_set_pipe(big_joiner_output, i);
> +
> + mode = &big_joiner_output->config.connector->modes[0];
> +
> + pipe = &display->pipes[i];
> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> +
> + igt_plane_set_fb(plane, &data->fb);
> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
> +
> + /* This commit is expected to fail as the adjacent pipe is already in use*/
> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY |
> + DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + igt_assert_lt(ret, 0);
> +
> + igt_output_set_pipe(big_joiner_output, PIPE_NONE);
> + igt_output_set_pipe(second_output, PIPE_NONE);
> + igt_plane_set_fb(plane, NULL);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> + }
> + }
> +
> + igt_remove_fb(data->drm_fd, &data->fb);
> +}
> +
> +static void test_basic_modeset(data_t *data)
> +{
> + drmModeModeInfo *mode;
> + igt_output_t *output, *big_joiner_output = NULL;
> + igt_display_t *display = &data->display;
> + int width = 0, height = 0, i;
> + igt_pipe_t *pipe;
> + igt_plane_t *plane;
> +
> + for_each_connected_output(display, output) {
> + if (data->big_joiner_output_id == output->id) {
> + mode = &output->config.connector->modes[data->mode_number];
> + big_joiner_output = output;
> + width = mode->hdisplay;
> + height = mode->vdisplay;
break here after we find the output ?
I think everything else looks good to me, lets wait for the innvalid test validation ersults.
Manasi
> + }
> +
> + igt_output_set_pipe(output, PIPE_NONE);
> + }
> +
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> +
> + igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
> + LOCAL_DRM_FORMAT_MOD_NONE, &data->fb);
> +
> + for_each_pipe(display, i) {
> + if (i < (data->n_pipes - 1)) {
> + igt_output_set_pipe(big_joiner_output, i);
> +
> + mode = &big_joiner_output->config.connector->modes[data->mode_number];
> + igt_output_override_mode(big_joiner_output, mode);
> +
> + pipe = &display->pipes[i];
> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> +
> + igt_plane_set_fb(plane, &data->fb);
> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
> +
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> +
> + igt_output_set_pipe(big_joiner_output, PIPE_NONE);
> + igt_plane_set_fb(plane, NULL);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> + }
> + }
> +
> + igt_remove_fb(data->drm_fd, &data->fb);
> +}
> +
> +igt_main
> +{
> + data_t data;
> + bool big_joiner_mode_found = false;
> + igt_output_t *output;
> + drmModeModeInfo *mode;
> + int valid_output = 0, i;
> +
> + igt_fixture {
> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + kmstest_set_vt_graphics_mode();
> +
> + igt_display_require(&data.display, data.drm_fd);
> +
> + for_each_connected_output(&data.display, output) {
> + if (!big_joiner_mode_found) {
> + for (i = 0; i < output->config.connector->count_modes; i++) {
> + mode = &output->config.connector->modes[i];
> + if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
> + big_joiner_mode_found = true;
> + data.mode_number = i;
> + data.big_joiner_output_id = output->id;
> + break;
> + }
> + }
> + }
> + valid_output++;
> + }
> +
> + data.n_pipes = 0;
> + for_each_pipe(&data.display, i)
> + data.n_pipes++;
> +
> + igt_require_f(big_joiner_mode_found, "No output with 5k+ mode found\n");
> + }
> +
> + igt_describe("Verify the basic modeset on big joiner mode on all pipes");
> + igt_subtest("basic")
> + test_basic_modeset(&data);
> +
> + igt_describe("Verify if the modeset on the adjoining pipe is rejected "
> + "when the pipe is active with a big joiner modeset");
> + igt_subtest("invalid-modeset") {
> + igt_require_f(valid_output > 1, "No valid Second output found\n");
> + test_invalid_modeset(&data);
> + }
> +
> + igt_fixture
> + igt_display_fini(&data.display);
> +}
> diff --git a/tests/meson.build b/tests/meson.build
> index 5eb2d2fc..42433424 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -21,6 +21,7 @@ test_progs = [
> 'kms_atomic_transition',
> 'kms_available_modes_crc',
> 'kms_big_fb',
> + 'kms_big_joiner' ,
> 'kms_busy',
> 'kms_ccs',
> 'kms_concurrent',
> --
> 2.22.0
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner
2020-09-18 23:30 ` [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Navare, Manasi
@ 2020-10-01 7:45 ` Karthik B S
0 siblings, 0 replies; 5+ messages in thread
From: Karthik B S @ 2020-10-01 7:45 UTC (permalink / raw)
To: Navare, Manasi; +Cc: igt-dev
On 9/19/2020 5:00 AM, Navare, Manasi wrote:
> On Thu, Sep 17, 2020 at 04:33:47PM +0530, Karthik B S wrote:
>> Added negative test to verify the different scenarios for big joiner.
>> In the test, modeset is done on Pipe A for a big joiner mode and
>> a second modeset is attempted on Pipe B which is expected to fail.
>> Same functionality is validated for other pipes as well.
>>
>> Secondly, the reverse is tested where a modeset is done on Pipe B
>> and then a second big joiner modeset is attempted on Pipe A which is
>> expected to fail. Same functionality is validated for other pipes as well.
>>
>> v2: -Rename HDISPLAY_5K to MAX_HDISPLAY_PER_PIPE. (Manasi)
>> -Do not assume mode[0] will be the highest mode.
>> Loop through the mode list to find the 8k mode. (Manasi)
>> -Add a subtest for verifying basic 8k modeset on all pipes. (Manasi)
>>
>> Signed-off-by: Karthik B S <karthik.b.s@intel.com>
>> ---
>> tests/Makefile.sources | 1 +
>> tests/kms_big_joiner.c | 251 +++++++++++++++++++++++++++++++++++++++++
>> tests/meson.build | 1 +
>> 3 files changed, 253 insertions(+)
>> create mode 100644 tests/kms_big_joiner.c
>>
>> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
>> index 6ae95155..ceec6274 100644
>> --- a/tests/Makefile.sources
>> +++ b/tests/Makefile.sources
>> @@ -37,6 +37,7 @@ TESTS_progs = \
>> kms_atomic_transition \
>> kms_available_modes_crc \
>> kms_big_fb \
>> + kms_big_joiner \
>> kms_busy \
>> kms_ccs \
>> kms_concurrent \
>> diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
>> new file mode 100644
>> index 00000000..d14ba96b
>> --- /dev/null
>> +++ b/tests/kms_big_joiner.c
>> @@ -0,0 +1,251 @@
>> +/*
>> + * Copyright © 2020 Intel Corporation
>> + *
>> + * Permission is hereby granted, free of charge, to any person obtaining a
>> + * copy of this software and associated documentation files (the "Software"),
>> + * to deal in the Software without restriction, including without limitation
>> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
>> + * and/or sell copies of the Software, and to permit persons to whom the
>> + * Software is furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice (including the next
>> + * paragraph) shall be included in all copies or substantial portions of the
>> + * Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
>> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>> + * IN THE SOFTWARE.
>> + *
>> + * Author:
>> + * Karthik B S <karthik.b.s@intel.com>
>> + */
>> +
>> +#include "igt.h"
>> +
>> +#define MAX_HDISPLAY_PER_PIPE 5120
>> +
>> +IGT_TEST_DESCRIPTION("Test big joiner");
>> +
>> +typedef struct {
>> + int drm_fd;
>> + igt_display_t display;
>> + struct igt_fb fb;
>> + int mode_number;
>> + int n_pipes;
>> + uint32_t big_joiner_output_id;
>> +} data_t;
>> +
>> +static void test_invalid_modeset(data_t *data)
>> +{
>> + drmModeModeInfo *mode;
>> + igt_display_t *display = &data->display;
>> + igt_output_t *output, *big_joiner_output = NULL, *second_output = NULL;
>> + int width = 0, height = 0, i, ret;
>> + igt_pipe_t *pipe;
>> + igt_plane_t *plane;
>> +
>> + for_each_connected_output(display, output) {
>> + mode = &output->config.connector->modes[0];
>> +
>> + if (data->big_joiner_output_id == output->id) {
>> + mode = &output->config.connector->modes[data->mode_number];
>> + big_joiner_output = output;
>> + } else if (second_output == NULL) {
>> + second_output = output;
>> + }
>> +
>> + width = max(width, mode->hdisplay);
>> + height = max(height, mode->vdisplay);
>> +
>> + igt_output_set_pipe(output, PIPE_NONE);
>> + }
>> +
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> +
>> + igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
>> + LOCAL_DRM_FORMAT_MOD_NONE, &data->fb);
>> +
>> + for_each_pipe(display, i) {
>> + if (i < (data->n_pipes - 1)) {
>> + igt_output_set_pipe(big_joiner_output, i);
>> +
>> + mode = &big_joiner_output->config.connector->modes[data->mode_number];
>> + igt_output_override_mode(big_joiner_output, mode);
>> +
>> + pipe = &display->pipes[i];
>> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
>> +
>> + igt_plane_set_fb(plane, &data->fb);
>> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
>> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
>> +
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> +
>> + igt_output_set_pipe(second_output, i + 1);
>> +
>> + mode = igt_output_get_mode(second_output);
>> +
>> + pipe = &display->pipes[i + 1];
>> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
>> +
>> + igt_plane_set_fb(plane, &data->fb);
>> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
>> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
>> +
>> + /* This commit is expectd to fail as this pipe is being used for big joiner */
>> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY |
>> + DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
>> + igt_assert_lt(ret, 0);
>> +
>> + igt_output_set_pipe(big_joiner_output, PIPE_NONE);
>> + igt_output_set_pipe(second_output, PIPE_NONE);
>> + igt_plane_set_fb(plane, NULL);
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> + }
>> + }
>> +
>> + for_each_pipe(display, i) {
>> + if (i < (data->n_pipes - 1)) {
>> + igt_output_set_pipe(second_output, i + 1);
>> +
>> + mode = igt_output_get_mode(second_output);
>> +
>> + pipe = &display->pipes[i + 1];
>> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
>> +
>> + igt_plane_set_fb(plane, &data->fb);
>> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
>> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
>> +
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> +
>> + igt_output_set_pipe(big_joiner_output, i);
>> +
>> + mode = &big_joiner_output->config.connector->modes[0];
>> +
>> + pipe = &display->pipes[i];
>> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
>> +
>> + igt_plane_set_fb(plane, &data->fb);
>> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
>> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
>> +
>> + /* This commit is expected to fail as the adjacent pipe is already in use*/
>> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY |
>> + DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
>> + igt_assert_lt(ret, 0);
>> +
>> + igt_output_set_pipe(big_joiner_output, PIPE_NONE);
>> + igt_output_set_pipe(second_output, PIPE_NONE);
>> + igt_plane_set_fb(plane, NULL);
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> + }
>> + }
>> +
>> + igt_remove_fb(data->drm_fd, &data->fb);
>> +}
>> +
>> +static void test_basic_modeset(data_t *data)
>> +{
>> + drmModeModeInfo *mode;
>> + igt_output_t *output, *big_joiner_output = NULL;
>> + igt_display_t *display = &data->display;
>> + int width = 0, height = 0, i;
>> + igt_pipe_t *pipe;
>> + igt_plane_t *plane;
>> +
>> + for_each_connected_output(display, output) {
>> + if (data->big_joiner_output_id == output->id) {
>> + mode = &output->config.connector->modes[data->mode_number];
>> + big_joiner_output = output;
>> + width = mode->hdisplay;
>> + height = mode->vdisplay;
>
> break here after we find the output ?
>
Thanks for the review.
Sure, I'll make this change.
> I think everything else looks good to me, lets wait for the innvalid test validation ersults.
>
Invalid test is now passing after minor changes in the clean up part.
I'll make these changes and send the next revision.
Thanks,
Karthik.B.S
> Manasi
>
>> + }
>> +
>> + igt_output_set_pipe(output, PIPE_NONE);
>> + }
>> +
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> +
>> + igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
>> + LOCAL_DRM_FORMAT_MOD_NONE, &data->fb);
>> +
>> + for_each_pipe(display, i) {
>> + if (i < (data->n_pipes - 1)) {
>> + igt_output_set_pipe(big_joiner_output, i);
>> +
>> + mode = &big_joiner_output->config.connector->modes[data->mode_number];
>> + igt_output_override_mode(big_joiner_output, mode);
>> +
>> + pipe = &display->pipes[i];
>> + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
>> +
>> + igt_plane_set_fb(plane, &data->fb);
>> + igt_fb_set_size(&data->fb, plane, mode->hdisplay, mode->vdisplay);
>> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
>> +
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> +
>> + igt_output_set_pipe(big_joiner_output, PIPE_NONE);
>> + igt_plane_set_fb(plane, NULL);
>> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>> + }
>> + }
>> +
>> + igt_remove_fb(data->drm_fd, &data->fb);
>> +}
>> +
>> +igt_main
>> +{
>> + data_t data;
>> + bool big_joiner_mode_found = false;
>> + igt_output_t *output;
>> + drmModeModeInfo *mode;
>> + int valid_output = 0, i;
>> +
>> + igt_fixture {
>> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
>> + kmstest_set_vt_graphics_mode();
>> +
>> + igt_display_require(&data.display, data.drm_fd);
>> +
>> + for_each_connected_output(&data.display, output) {
>> + if (!big_joiner_mode_found) {
>> + for (i = 0; i < output->config.connector->count_modes; i++) {
>> + mode = &output->config.connector->modes[i];
>> + if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
>> + big_joiner_mode_found = true;
>> + data.mode_number = i;
>> + data.big_joiner_output_id = output->id;
>> + break;
>> + }
>> + }
>> + }
>> + valid_output++;
>> + }
>> +
>> + data.n_pipes = 0;
>> + for_each_pipe(&data.display, i)
>> + data.n_pipes++;
>> +
>> + igt_require_f(big_joiner_mode_found, "No output with 5k+ mode found\n");
>> + }
>> +
>> + igt_describe("Verify the basic modeset on big joiner mode on all pipes");
>> + igt_subtest("basic")
>> + test_basic_modeset(&data);
>> +
>> + igt_describe("Verify if the modeset on the adjoining pipe is rejected "
>> + "when the pipe is active with a big joiner modeset");
>> + igt_subtest("invalid-modeset") {
>> + igt_require_f(valid_output > 1, "No valid Second output found\n");
>> + test_invalid_modeset(&data);
>> + }
>> +
>> + igt_fixture
>> + igt_display_fini(&data.display);
>> +}
>> diff --git a/tests/meson.build b/tests/meson.build
>> index 5eb2d2fc..42433424 100644
>> --- a/tests/meson.build
>> +++ b/tests/meson.build
>> @@ -21,6 +21,7 @@ test_progs = [
>> 'kms_atomic_transition',
>> 'kms_available_modes_crc',
>> 'kms_big_fb',
>> + 'kms_big_joiner' ,
>> 'kms_busy',
>> 'kms_ccs',
>> 'kms_concurrent',
>> --
>> 2.22.0
>>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-01 7:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-17 11:03 [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Karthik B S
2020-09-17 12:21 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_big_joiner: Add test to validate big joiner (rev2) Patchwork
2020-09-17 13:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2020-09-18 23:30 ` [igt-dev] [PATCH i-g-t v2] tests/kms_big_joiner: Add test to validate big joiner Navare, Manasi
2020-10-01 7:45 ` 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.