<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> [AMD Official Use Only - AMD Internal Distribution Only] <div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com></div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div id="Signature" style="color: inherit;"> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> --</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Regards,</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Aurabindo </div> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Kunal Joshi <kunal1.joshi@intel.com> Sent: Monday, June 17, 2024 12:10 PM To: igt-dev@lists.freedesktop.org <igt-dev@lists.freedesktop.org> Cc: Kunal Joshi <kunal1.joshi@intel.com>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com> Subject: [PATCH i-g-t 1/2] tests/kms_bw: add subtest for only connected outputs <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">forcing DP connector doesn't work well and tests are skipping with unsupported mode, add new test which runs test on connected outputs only. v2: added debug print for better clarity of skips on unsupported mode Cc: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com> Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com> --- tests/kms_bw.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/tests/kms_bw.c b/tests/kms_bw.c index 05f7e79ad..9f376bfe3 100644 --- a/tests/kms_bw.c +++ b/tests/kms_bw.c @@ -48,6 +48,19 @@ * @2560x1440p: 2560x1440 resolution * @3840x2160p: 3840x2160 resolution * @2160x1440p: 2160x1440 resolution + * + * SUBTEST: connected-linear-tiling-%d-displays-%s + * Description: bw test with %arg[2] + * + * arg[1].values: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 + * + * arg[2]: + * + * @1920x1080p: 1920x1080 resolution + * @2560x1440p: 2560x1440 resolution + * @3840x2160p: 3840x2160 resolution + * @2160x1440p: 2160x1440 resolution + * */ /* Common test data. */ @@ -55,6 +68,7 @@ typedef struct data { igt_display_t display; igt_plane_t *primary[IGT_MAX_PIPES]; igt_output_t *output[IGT_MAX_PIPES]; + igt_output_t *connected_output[IGT_MAX_PIPES]; igt_pipe_t *pipe[IGT_MAX_PIPES]; igt_pipe_crc_t *pipe_crc[IGT_MAX_PIPES]; drmModeModeInfo mode[IGT_MAX_PIPES]; @@ -62,6 +76,7 @@ typedef struct data { int w[IGT_MAX_PIPES]; int h[IGT_MAX_PIPES]; int fd; + int connected_outputs; } data_t; static drmModeModeInfo test_mode[] = { @@ -108,6 +123,7 @@ static void test_init(data_t *data) igt_display_t *display = &data->display; int i, max_pipes = display->n_pipes; igt_output_t *output; + data->connected_outputs = 0; for_each_pipe(display, i) { data->pipe_id[i] = i; @@ -124,12 +140,12 @@ static void test_init(data_t *data) continue; output = &display->outputs[i]; - data->output[i] = output; /* Only allow physically connected displays for the tests. */ if (!igt_output_is_connected(output)) continue; + data->connected_output[data->connected_outputs++] = output; igt_assert(kmstest_get_connector_default_mode( data->fd, output->config.connector, &data->mode[i])); @@ -173,7 +189,7 @@ static void force_output_mode(data_t *d, igt_output_t *output, igt_output_override_mode(output, mode); } -static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo *mode) { +static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo *mode, bool physical) { igt_display_t *display = &data->display; igt_output_t *output; struct igt_fb buffer[IGT_MAX_PIPES]; @@ -189,11 +205,15 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo igt_skip_on_f(pipe >= num_pipes, "ASIC does not have %d pipes\n", pipe); + igt_skip_on_f(physical && pipe > data->connected_outputs , + "Only %d connected need %d pipes\n",data->connected_outputs, pipe); + + test_init(data); /* create buffers */ for (i = 0; i <= pipe; i++) { - output = data->output[i]; + output = physical ? data->connected_output[i] : data->output[i]; if (!output) { continue; } @@ -208,6 +228,8 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo igt_output_set_pipe(output, i); igt_plane_set_fb(data->primary[i], &buffer[i]); + igt_info("Assigning pipe %s to output %s with mode %s", + kmstest_pipe_name(i), igt_output_name(output), mode->name); } ret = igt_display_try_commit_atomic(display, @@ -219,7 +241,7 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); for (i = 0; i <= pipe; i++) { - output = data->output[i]; + output = physical ? data->connected_output[i] : data->output[i]; if (!output) { continue; } @@ -230,7 +252,7 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo } for (i = pipe; i >= 0; i--) { - output = data->output[i]; + output = physical ? data->connected_output[i] : data->output[i]; if (!output) continue; @@ -265,10 +287,19 @@ igt_main for (j = 0; j < ARRAY_SIZE(test_mode); j++) { igt_subtest_f("linear-tiling-%d-displays-%s", i+1, test_mode[j].name) - run_test_linear_tiling(&data, i, &test_mode[j]); + run_test_linear_tiling(&data, i, &test_mode[j], false); } } + for (i = 0; i < IGT_MAX_PIPES; i++) { + for (j = 0; j < ARRAY_SIZE(test_mode); j++) { + igt_subtest_f("connected-linear-tiling-%d-displays-%s", i+1, + test_mode[j].name) + run_test_linear_tiling(&data, i, &test_mode[j], true); + } + } + + igt_fixture { igt_display_fini(&data.display); -- 2.25.1 </div> </div> </div> </body> </html>