From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [i-g-t v8 37/51] tests/i915/kms_big_joiner: Negative tests for Bigjoiner
Date: Thu, 23 Feb 2023 20:40:04 +0530 [thread overview]
Message-ID: <20230223151018.2565040-38-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20230223151018.2565040-1-bhanuprakash.modem@intel.com>
Add negative tests to validate Bigjoiner or 8K mode.
Example:
* Pipe-D wont support a mode > 5K
* To use 8K mode on a pipe then consecutive pipe must be available & free.
Kernel should reject the commit/modeset if above conditions won't met.
V2:
- Fix redundant negative tests
V3:
- Drop duplicate logic
V4:
- Fix the CRASH in CI
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Karthik B S <karthik.b.s@intel.com>
---
tests/i915/kms_big_joiner.c | 208 ++++++++++++++++--------------------
1 file changed, 91 insertions(+), 117 deletions(-)
diff --git a/tests/i915/kms_big_joiner.c b/tests/i915/kms_big_joiner.c
index 71b2526d6..8be60ea11 100644
--- a/tests/i915/kms_big_joiner.c
+++ b/tests/i915/kms_big_joiner.c
@@ -37,119 +37,47 @@ typedef struct {
int n_pipes;
enum pipe pipe1;
enum pipe pipe2;
- struct output_data {
- uint32_t id;
- int mode_number;
- } big_joiner_output[2];
+ uint32_t big_joiner_output[2];
} data_t;
static void test_invalid_modeset(data_t *data)
{
- drmModeModeInfo *mode;
+ igt_output_t *output;
igt_display_t *display = &data->display;
- igt_output_t *output, *big_joiner_output = NULL, *second_output = NULL;
int ret;
- igt_pipe_t *pipe;
- igt_plane_t *plane;
-
- igt_display_reset(display);
-
- for_each_connected_output(display, output) {
- mode = &output->config.connector->modes[0];
-
- if (data->big_joiner_output[0].id == output->id) {
- big_joiner_output = output;
- } else if (second_output == NULL) {
- second_output = output;
- }
- }
- igt_output_set_pipe(big_joiner_output, data->pipe1);
-
- mode = &big_joiner_output->config.connector->modes[data->big_joiner_output[0].mode_number];
- igt_output_override_mode(big_joiner_output, mode);
-
- pipe = &display->pipes[data->pipe1];
- plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+ igt_info("Bigjoiner test on ");
+ for_each_connected_output(display, output){
+ enum pipe p = output->pending_pipe;
+ drmModeModeInfo *mode;
+ igt_pipe_t *pipe;
+ igt_plane_t *plane;
- 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);
+ if (p == PIPE_NONE)
+ continue;
- igt_display_commit2(display, COMMIT_ATOMIC);
-
- igt_output_set_pipe(second_output, data->pipe2);
+ mode = igt_output_get_mode(output);
+ igt_info("pipe:%s, output:%s, mode:", kmstest_pipe_name(p), igt_output_name(output));
+ kmstest_dump_mode(mode);
- mode = igt_output_get_mode(second_output);
+ pipe = &display->pipes[p];
+ plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
- pipe = &display->pipes[data->pipe2];
- 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_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_assert(!igt_check_bigjoiner_support(display));
/* This commit is expectd to fail as this pipe is being used for big joiner */
ret = igt_display_try_commit_atomic(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);
-
- pipe = &display->pipes[data->pipe1];
- plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
-
- /*
- * Do not explicitly set the plane of the second output to NULL,
- * as it is the adjacent pipe to the big joiner output and
- * setting the big joiner plane to NULL will take care of this.
- */
- igt_plane_set_fb(plane, NULL);
- igt_display_commit2(display, COMMIT_ATOMIC);
- igt_output_override_mode(big_joiner_output, NULL);
-
- igt_output_set_pipe(second_output, data->pipe2);
-
- mode = igt_output_get_mode(second_output);
-
- pipe = &display->pipes[data->pipe2];
- 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_reset(&data->display);
igt_display_commit2(display, COMMIT_ATOMIC);
- igt_output_set_pipe(big_joiner_output, data->pipe1);
-
- mode = &big_joiner_output->config.connector->modes[data->big_joiner_output[0].mode_number];
- igt_output_override_mode(big_joiner_output, mode);
-
- pipe = &display->pipes[data->pipe1];
- 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(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);
-
- pipe = &display->pipes[data->pipe2];
- plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
- igt_plane_set_fb(plane, NULL);
-
- igt_display_commit2(display, COMMIT_ATOMIC);
-
- igt_output_override_mode(big_joiner_output, NULL);
}
static void test_basic_modeset(data_t *data)
@@ -163,7 +91,7 @@ static void test_basic_modeset(data_t *data)
igt_display_reset(display);
for_each_connected_output(display, output) {
- if (data->big_joiner_output[0].id == output->id) {
+ if (data->big_joiner_output[0] == output->id) {
big_joiner_output = output;
break;
}
@@ -171,7 +99,9 @@ static void test_basic_modeset(data_t *data)
igt_output_set_pipe(big_joiner_output, data->pipe1);
- mode = &big_joiner_output->config.connector->modes[data->big_joiner_output[0].mode_number];
+ igt_sort_connector_modes(big_joiner_output->config.connector,
+ sort_drm_modes_by_res_dsc);
+ mode = &big_joiner_output->config.connector->modes[0];
igt_output_override_mode(big_joiner_output, mode);
pipe = &display->pipes[data->pipe1];
@@ -200,7 +130,7 @@ static void test_dual_display(data_t *data)
igt_display_reset(display);
for_each_connected_output(display, output) {
- if (data->big_joiner_output[count].id == output->id) {
+ if (data->big_joiner_output[count] == output->id) {
big_joiner_output[count] = output;
count++;
}
@@ -213,7 +143,9 @@ static void test_dual_display(data_t *data)
igt_output_set_pipe(big_joiner_output[1], data->pipe2);
/* Set up first big joiner output on Pipe A*/
- mode = &big_joiner_output[0]->config.connector->modes[data->big_joiner_output[0].mode_number];
+ igt_sort_connector_modes(big_joiner_output[0]->config.connector,
+ sort_drm_modes_by_res_dsc);
+ mode = &big_joiner_output[0]->config.connector->modes[0];
igt_output_override_mode(big_joiner_output[0], mode);
pipe = &display->pipes[data->pipe1];
@@ -224,7 +156,9 @@ static void test_dual_display(data_t *data)
igt_plane_set_size(plane1, mode->hdisplay, mode->vdisplay);
/* Set up second big joiner output on Pipe C*/
- mode = &big_joiner_output[1]->config.connector->modes[data->big_joiner_output[1].mode_number];
+ igt_sort_connector_modes(big_joiner_output[1]->config.connector,
+ sort_drm_modes_by_res_dsc);
+ mode = &big_joiner_output[1]->config.connector->modes[0];
igt_output_override_mode(big_joiner_output[1], mode);
pipe = &display->pipes[data->pipe2];
@@ -261,19 +195,15 @@ igt_main
igt_require(data.display.is_atomic);
for_each_connected_output(&data.display, output) {
- if (count < 2) {
- for (i = 0; i < output->config.connector->count_modes; i++) {
- mode = &output->config.connector->modes[i];
- if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
- data.big_joiner_output[count].mode_number = i;
- data.big_joiner_output[count].id = output->id;
- count++;
-
- width = max(width, mode->hdisplay);
- height = max(height, mode->vdisplay);
- break;
- }
- }
+ igt_sort_connector_modes(output->config.connector,
+ sort_drm_modes_by_res_dsc);
+
+ mode = &output->config.connector->modes[0];
+ if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
+ data.big_joiner_output[count++] = output->id;
+
+ width = max(width, mode->hdisplay);
+ height = max(height, mode->vdisplay);
}
valid_output++;
}
@@ -303,14 +233,58 @@ igt_main
igt_describe("Verify if the modeset on the adjoining pipe is rejected "
"when the pipe is active with a big joiner modeset");
igt_subtest_with_dynamic("invalid-modeset") {
- igt_require_f(valid_output > 1, "No valid Second output found\n");
- for (i = 0; i < data.n_pipes - 1; i++) {
- data.pipe1 = pipe_seq[i];
- data.pipe2 = pipe_seq[i + 1];
- igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe_seq[i]),
- kmstest_pipe_name(pipe_seq[i + 1]))
+ data.pipe1 = pipe_seq[j - 1];
+
+ igt_display_reset(&data.display);
+ for_each_connected_output(&data.display, output) {
+ if (data.big_joiner_output[0] != output->id)
+ continue;
+
+ igt_sort_connector_modes(output->config.connector,
+ sort_drm_modes_by_res_dsc);
+
+ igt_output_set_pipe(output, data.pipe1);
+ igt_output_override_mode(output, &output->config.connector->modes[0]);
+
+ igt_dynamic_f("pipe-%s-%s",
+ kmstest_pipe_name(data.pipe1),
+ igt_output_name(output))
test_invalid_modeset(&data);
}
+
+ if(valid_output > 1) {
+ for (i = 0; i < data.n_pipes - 1; i++) {
+ igt_output_t *first_output = NULL, *second_output = NULL;
+
+ data.pipe1 = pipe_seq[i];
+ data.pipe2 = pipe_seq[i + 1];
+
+ igt_display_reset(&data.display);
+ for_each_connected_output(&data.display, output) {
+ igt_sort_connector_modes(output->config.connector,
+ sort_drm_modes_by_res_dsc);
+
+ if (data.big_joiner_output[0] == output->id) {
+ first_output = output;
+ igt_output_set_pipe(output, data.pipe1);
+ igt_output_override_mode(output, &output->config.connector->modes[0]);
+ } else if (second_output == NULL) {
+ second_output = output;
+ igt_output_set_pipe(output, data.pipe2);
+ igt_output_override_mode(output, &output->config.connector->modes[0]);
+
+ break;
+ }
+ }
+
+ igt_dynamic_f("pipe-%s-%s-pipe-%s-%s",
+ kmstest_pipe_name(data.pipe1),
+ igt_output_name(first_output),
+ kmstest_pipe_name(data.pipe2),
+ igt_output_name(second_output))
+ test_invalid_modeset(&data);
+ }
+ }
}
igt_describe("Verify simultaneous modeset on 2 big joiner outputs");
--
2.39.1
next prev parent reply other threads:[~2023-02-23 15:16 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 15:09 [igt-dev] [i-g-t v8 00/51] Add IGT support for Bigjoiner Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 01/51] lib/igt_kms: Add a helper for valid pipe/output constraint Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 02/51] lib/igt_kms: Bigjoiner check in max_bpc constraint Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 03/51] tests/kms_async_flips: Add support for Bigjoiner Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 04/51] tests/kms_atomic: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 05/51] tests/kms_atomic_interruptible: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 06/51] tests/kms_atomic_transition: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 07/51] tests/kms_color_helper: Helper to check Bigjoiner constraint Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 08/51] tests/kms_color: Add support for Bigjoiner Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 09/51] tests/chamelium/kms_color_chamelium: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 10/51] tests/kms_content_protection: " Bhanuprakash Modem
2023-03-17 6:31 ` Karthik B S
2023-03-17 6:33 ` Modem, Bhanuprakash
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 11/51] tests/kms_concurrent: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 12/51] tests/kms_cursor_crc: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 13/51] tests/kms_cursor_edge_walk: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 14/51] tests/kms_cursor_legacy: " Bhanuprakash Modem
2023-03-16 9:44 ` [igt-dev] [i-g-t V9 " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 15/51] tests/kms_display_modes: " Bhanuprakash Modem
2023-03-20 10:24 ` B, Jeevan
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 16/51] tests/kms_dp_tiled_display: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 17/51] tests/kms_flip_event_leak: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 18/51] tests/kms_invalid_mode: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 19/51] tests/kms_lease: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 20/51] tests/kms_pipe_crc_basic: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 21/51] tests/kms_plane: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 22/51] tests/kms_plane_alpha_blend: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 23/51] tests/kms_plane_cursor: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 24/51] tests/kms_plane_lowres: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 25/51] tests/kms_plane_multiple: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 26/51] tests/kms_plane_scaling: " Bhanuprakash Modem
2023-03-17 5:09 ` [igt-dev] [i-g-t V9 " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 27/51] tests/kms_prime: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 28/51] tests/kms_properties: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 29/51] tests/kms_rmfb: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 30/51] tests/kms_rotation_crc: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 31/51] tests/kms_scaling_modes: " Bhanuprakash Modem
2023-02-23 15:09 ` [igt-dev] [i-g-t v8 32/51] tests/kms_sequence: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 33/51] tests/kms_universal_plane: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 34/51] tests/kms_vblank: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 35/51] tests/kms_vrr: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 36/51] tests/i915/kms_big_fb: " Bhanuprakash Modem
2023-02-23 15:10 ` Bhanuprakash Modem [this message]
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 38/51] tests/i915/kms_busy: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 39/51] tests/i915/kms_ccs: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 40/51] tests/i915/kms_cdclk: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 41/51] tests/i915/kms_draw_crc: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 42/51] tests/i915/kms_fence_pin_leak: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 43/51] tests/i915/kms_flip_scaled_crc: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 44/51] tests/i915/kms_flip_tiling: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 45/51] tests/i915/kms_frontbuffer_tracking: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 46/51] tests/i915/kms_mmap_write_crc: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 47/51] tests/i915/kms_psr2_sf: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 48/51] tests/i915/kms_psr2_su: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 49/51] tests/i915/kms_psr: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 50/51] tests/i915/kms_psr_stress_test: " Bhanuprakash Modem
2023-02-23 15:10 ` [igt-dev] [i-g-t v8 51/51] tests/i915/kms_pwrite_crc: " Bhanuprakash Modem
2023-02-23 16:33 ` [igt-dev] ✓ Fi.CI.BAT: success for Add IGT support for Bigjoiner (rev21) Patchwork
2023-02-23 20:22 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2023-03-17 4:12 ` [igt-dev] ✗ Fi.CI.BUILD: failure for Add IGT support for Bigjoiner (rev23) Patchwork
2023-03-17 6:03 ` [igt-dev] ✓ Fi.CI.BAT: success for Add IGT support for Bigjoiner (rev24) Patchwork
2023-03-17 7:28 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-01-04 17:00 [igt-dev] [i-g-t v7 37/51] tests/i915/kms_big_joiner: Negative tests for Bigjoiner Bhanuprakash Modem
2023-01-18 16:23 ` [igt-dev] [i-g-t v8 " Bhanuprakash Modem
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230223151018.2565040-38-bhanuprakash.modem@intel.com \
--to=bhanuprakash.modem@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox