* [PATCH i-g-t 1/2] tests/intel/kms_big_joiner: add new subtest simultaneous-modeset
2023-12-26 10:34 [PATCH i-g-t 0/2] add new subtest simultaneous-modeset Kunal Joshi
@ 2023-12-26 10:34 ` Kunal Joshi
2023-12-26 10:34 ` [PATCH i-g-t 2/2] HAX patch do not merge Kunal Joshi
1 sibling, 0 replies; 3+ messages in thread
From: Kunal Joshi @ 2023-12-26 10:34 UTC (permalink / raw)
To: igt-dev; +Cc: Kunal Joshi
add new test that tries to have as many outputs as possible,
prefernce is given to big_joiner outputs, with this we can
stress on bw
v2: Sorting not needed when output count is 1
Skip if output count is 0
v3: Rebase
v4: subject corrdction (Swati)
Cc: Karthik B S <karthik.b.s@intel.com>
Cc: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com>
---
tests/intel/kms_big_joiner.c | 161 ++++++++++++++++++++++++++++++-----
1 file changed, 140 insertions(+), 21 deletions(-)
diff --git a/tests/intel/kms_big_joiner.c b/tests/intel/kms_big_joiner.c
index aba2adfbe..b43855149 100644
--- a/tests/intel/kms_big_joiner.c
+++ b/tests/intel/kms_big_joiner.c
@@ -46,6 +46,14 @@
*
* SUBTEST: 2x-modeset
* Description: Verify simultaneous modeset on 2 big joiner outputs
+ *
+ * SUBTEST: simultaneous-modeset
+ * Description: Try to do modeset with as many output as possible
+ * with big joiner given as priority
+ * Driver requirement: i915, xe
+ * Functionality: BW
+ * Mega feature: Bigjoiner, BW
+ * Test category: BW test
*/
IGT_TEST_DESCRIPTION("Test big joiner");
@@ -63,10 +71,120 @@ typedef struct {
enum pipe pipe1;
enum pipe pipe2;
struct bigjoiner_output output[2];
+ int no_of_big_joiner_outputs;
+ igt_output_t **sorted_outputs;
+ int no_sorted_outputs;
} data_t;
static int max_dotclock;
+static bool bigjoiner_mode_found(drmModeConnector *connector,
+ int (*sort_method)(const void *, const void*),
+ drmModeModeInfo *mode)
+{
+ igt_sort_connector_modes(connector, sort_method);
+ *mode = connector->modes[0];
+
+ return igt_bigjoiner_possible(mode, max_dotclock);
+}
+
+/*
+ * Sort outputs based on max_dot_clock and hdisplay
+ * and override output with highest max_dot_clock or hdisplay
+ */
+static int compare_outputs(const void *a, const void *b)
+{
+ drmModeModeInfo mode_A_clock, mode_A_res, mode_B_clock, mode_B_res;
+ bool big_joiner_res_A, big_joiner_mode_clock_A, big_joiner_res_B, big_joiner_mode_clock_B;
+ igt_output_t *outputA = *(igt_output_t **)a;
+ igt_output_t *outputB = *(igt_output_t **)b;
+
+ big_joiner_res_A = bigjoiner_mode_found(outputA->config.connector,
+ sort_drm_modes_by_res_dsc,
+ &mode_A_res);
+ big_joiner_mode_clock_A = bigjoiner_mode_found(outputA->config.connector,
+ sort_drm_modes_by_clk_dsc,
+ &mode_A_clock);
+ big_joiner_res_B = bigjoiner_mode_found(outputB->config.connector,
+ sort_drm_modes_by_res_dsc,
+ &mode_B_res);
+ big_joiner_mode_clock_B = bigjoiner_mode_found(outputB->config.connector,
+ sort_drm_modes_by_clk_dsc,
+ &mode_B_clock);
+ igt_output_override_mode(outputA,
+ big_joiner_mode_clock_A ?
+ &mode_A_clock : &mode_A_res);
+ igt_output_override_mode(outputB,
+ big_joiner_mode_clock_B ?
+ &mode_B_clock : &mode_B_res);
+
+ return (big_joiner_mode_clock_B != big_joiner_mode_clock_A) ?
+ big_joiner_mode_clock_B - big_joiner_mode_clock_A :
+ big_joiner_res_B - big_joiner_res_A;
+}
+
+static void set_sorted_outputs(data_t *data)
+{
+ int i;
+ igt_output_t *output;
+
+ i = 0;
+ for_each_connected_output(&data->display, output)
+ data->no_sorted_outputs++;
+
+ igt_skip_on_f(data->no_sorted_outputs <= 0, "No output found\n");
+ /*
+ * Create an array to store igt_output_t pointers
+ */
+ data->sorted_outputs = (igt_output_t **)malloc(sizeof(igt_output_t *) * data->no_sorted_outputs);
+ /*
+ * Add connected outputs to the array
+ */
+ for_each_connected_output(&data->display, output)
+ data->sorted_outputs[i++] = output;
+
+ if (data->no_sorted_outputs > 1)
+ qsort(data->sorted_outputs, data->no_sorted_outputs,
+ sizeof(igt_output_t *), compare_outputs);
+}
+
+static int run_simultaneous_modeset(data_t *data)
+{
+ int pipe, i, j;
+ int remanining_big_joiner_outputs;
+ struct igt_fb *primary_fb = malloc(data->n_pipes * sizeof(struct igt_fb));
+ igt_plane_t **primary = malloc(data->n_pipes * sizeof(igt_plane_t *));
+ drmModeModeInfo *mode;
+ igt_output_t *output;
+
+ remanining_big_joiner_outputs = data->no_of_big_joiner_outputs;
+ pipe = i = j = 0;
+ set_sorted_outputs(data);
+
+ while (pipe < data->n_pipes) {
+ output = i < data->no_sorted_outputs ? data->sorted_outputs[i] : NULL;
+ if (output == NULL)
+ break;
+ mode = igt_output_get_mode(output);
+ igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
+ DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 1.0, 0.0, 0.0, &primary_fb[i]);
+ igt_output_set_pipe(output, pipe);
+ igt_info("Using (pipe %s + %s) to run the subtest with mode %dx%d@%d.\n",
+ kmstest_pipe_name(pipe), igt_output_name(output),
+ mode->hdisplay, mode->vdisplay, mode->vrefresh);
+ primary[i] = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+ igt_plane_set_fb(primary[i], &primary_fb[i]);
+ i++;
+ pipe = pipe + ((remanining_big_joiner_outputs > 0) ? 2 : 1);
+ --remanining_big_joiner_outputs;
+ }
+ if (igt_display_try_commit2(&data->display, COMMIT_ATOMIC) == 0) {
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
+ return 0;
+ } else
+ return igt_display_try_commit2(&data->display, COMMIT_ATOMIC);
+}
+
static void test_invalid_modeset(data_t *data)
{
igt_output_t *output;
@@ -199,22 +317,12 @@ static void test_dual_display(data_t *data)
igt_display_commit2(display, COMMIT_ATOMIC);
}
-static bool bigjoiner_mode_found(drmModeConnector *connector,
- int (*sort_method)(const void *, const void*),
- drmModeModeInfo *mode)
-{
- igt_sort_connector_modes(connector, sort_method);
- *mode = connector->modes[0];
-
- return igt_bigjoiner_possible(mode, max_dotclock);
-}
-
igt_main
{
data_t data;
igt_output_t *output;
drmModeModeInfo mode;
- int valid_output = 0, i, count = 0, j = 0;
+ int valid_output = 0, i, j = 0;
uint16_t width = 0, height = 0;
enum pipe pipe_seq[IGT_MAX_PIPES];
@@ -226,6 +334,8 @@ igt_main
igt_require(data.display.is_atomic);
max_dotclock = igt_get_max_dotclock(data.drm_fd);
+ data.no_of_big_joiner_outputs = 0;
+ data.no_sorted_outputs = 0;
for_each_connected_output(&data.display, output) {
bool found = false;
@@ -240,9 +350,8 @@ igt_main
true : false;
if (found) {
- data.output[count].output_id = output->id;
- memcpy(&data.output[count].mode, &mode, sizeof(drmModeModeInfo));
- count++;
+ data.output[data.no_of_big_joiner_outputs].output_id = output->id;
+ memcpy(&data.output[data.no_of_big_joiner_outputs++].mode, &mode, sizeof(drmModeModeInfo));
width = max(width, mode.hdisplay);
height = max(height, mode.vdisplay);
@@ -256,25 +365,28 @@ igt_main
pipe_seq[j] = i;
j++;
}
-
- igt_require_f(count > 0, "No output with 5k+ mode (or) clock > max-dot-clock found\n");
-
- igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
- DRM_FORMAT_MOD_LINEAR, &data.fb);
}
igt_describe("Verify the basic modeset on big joiner mode on all pipes");
igt_subtest_with_dynamic("basic") {
+ igt_require_f(data.no_of_big_joiner_outputs > 0, "No output with 5k+ mode (or) clock > max-dot-clock found\n");
+ igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
+ DRM_FORMAT_MOD_LINEAR, &data.fb);
for (i = 0; i < data.n_pipes - 1; i++) {
data.pipe1 = pipe_seq[i];
igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe_seq[i]))
test_basic_modeset(&data);
}
+ igt_remove_fb(data.drm_fd, &data.fb);
}
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(data.no_of_big_joiner_outputs > 0, "No output with 5k+ mode (or) clock > max-dot-clock found\n");
+ igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
+ DRM_FORMAT_MOD_LINEAR, &data.fb);
+
data.pipe1 = pipe_seq[j - 1];
igt_display_reset(&data.display);
@@ -323,11 +435,14 @@ igt_main
test_invalid_modeset(&data);
}
}
+ igt_remove_fb(data.drm_fd, &data.fb);
}
igt_describe("Verify simultaneous modeset on 2 big joiner outputs");
igt_subtest_with_dynamic("2x-modeset") {
- igt_require_f(count > 1, "2 outputs with big joiner modes are required\n");
+ igt_require_f(data.no_of_big_joiner_outputs > 1, "2 outputs with big joiner modes are required\n");
+ igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
+ DRM_FORMAT_MOD_LINEAR, &data.fb);
igt_require_f(data.n_pipes > 3, "Minumum of 4 pipes are required\n");
for (i = 0; (i + 2) < data.n_pipes - 1; i++) {
data.pipe1 = pipe_seq[i];
@@ -335,10 +450,14 @@ igt_main
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe_seq[i]), kmstest_pipe_name(pipe_seq[i + 2]))
test_dual_display(&data);
}
+ igt_remove_fb(data.drm_fd, &data.fb);
}
+ igt_describe("Simultaneous moseset on all pipes possible");
+ igt_subtest("simultaneous-modeset")
+ igt_assert_f(run_simultaneous_modeset(&data) == 0, "Commit failure\n");
+
igt_fixture {
- igt_remove_fb(data.drm_fd, &data.fb);
igt_display_fini(&data.display);
drm_close_driver(data.drm_fd);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread