From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79DE910EC6D for ; Thu, 22 Sep 2022 16:04:12 +0000 (UTC) From: Bhanuprakash Modem To: igt-dev@lists.freedesktop.org Date: Thu, 22 Sep 2022 21:29:50 +0530 Message-Id: <20220922160004.2041598-39-bhanuprakash.modem@intel.com> In-Reply-To: <20220922160004.2041598-1-bhanuprakash.modem@intel.com> References: <20220922160004.2041598-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [i-g-t V4 38/52] tests/i915/kms_big_joiner: Negative tests for Bigjoiner List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: 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 Signed-off-by: Bhanuprakash Modem --- tests/i915/kms_big_joiner.c | 194 ++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 109 deletions(-) diff --git a/tests/i915/kms_big_joiner.c b/tests/i915/kms_big_joiner.c index 7d400616..a1efb146 100644 --- a/tests/i915/kms_big_joiner.c +++ b/tests/i915/kms_big_joiner.c @@ -45,111 +45,40 @@ typedef struct { 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); + 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); - igt_output_set_pipe(second_output, data->pipe2); + pipe = &display->pipes[p]; + plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY); - 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_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(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) @@ -261,19 +190,17 @@ 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].mode_number = i; + data.big_joiner_output[count].id = output->id; + count++; + + width = max(width, mode->hdisplay); + height = max(height, mode->vdisplay); } valid_output++; } @@ -303,14 +230,63 @@ 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) { + igt_sort_connector_modes(output->config.connector, + sort_drm_modes_by_res_dsc); + + if (data.big_joiner_output[0].id != 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_assert(!igt_check_bigjoiner_support(&data.display)); + + 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].id == 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]); + } + } + + igt_assert(!igt_check_bigjoiner_support(&data.display)); + + 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.37.3