Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CD8A10E218 for ; Mon, 5 Sep 2022 08:48:21 +0000 (UTC) Message-ID: Date: Mon, 5 Sep 2022 14:18:03 +0530 Content-Language: en-US To: Karthik B S , References: <20220811051920.31077-1-karthik.b.s@intel.com> From: "Modem, Bhanuprakash" In-Reply-To: <20220811051920.31077-1-karthik.b.s@intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t v2] tests/kms_plane_multiple: Convert tests to dynamic List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Thu-11-08-2022 10:49 am, Karthik B S wrote: > Covert the existing subtests to dynamic subtests at pipe/output level. > > v2: -Remove igt_skip_on before dynamic subtest (Bhanu) > -Use for_each_pipe_with_valid_output (Bhanu) > -Add igt_display_require_output (Bhanu) > > Signed-off-by: Karthik B S Reviewed-by: Bhanuprakash Modem > --- > tests/kms_plane_multiple.c | 75 +++++++++++++++++++------------------- > 1 file changed, 38 insertions(+), 37 deletions(-) > > diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c > index 1679f7ce..d4ae5c4b 100644 > --- a/tests/kms_plane_multiple.c > +++ b/tests/kms_plane_multiple.c > @@ -109,9 +109,6 @@ get_reference_crc(data_t *data, igt_output_t *output, enum pipe pipe, > > mode = igt_output_get_mode(output); > > - igt_skip_on(!igt_plane_has_format_mod(data->plane[primary->index], > - DRM_FORMAT_XRGB8888, modifier)); > - > igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, > DRM_FORMAT_XRGB8888, > modifier, > @@ -138,10 +135,6 @@ create_fb_for_mode_position(data_t *data, igt_output_t *output, drmModeModeInfo > > primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > > - igt_skip_on(!igt_display_has_format_mod(&data->display, > - DRM_FORMAT_XRGB8888, > - modifier)); > - > fb_id = igt_create_fb(data->drm_fd, > mode->hdisplay, mode->vdisplay, > DRM_FORMAT_XRGB8888, > @@ -363,15 +356,11 @@ test_plane_position_with_output(data_t *data, enum pipe pipe, > } > > static void > -test_plane_position(data_t *data, enum pipe pipe, uint64_t modifier) > +test_plane_position(data_t *data, enum pipe pipe, igt_output_t *output, uint64_t modifier) > { > - igt_output_t *output; > int n_planes = opt.all_planes ? > data->display.pipes[pipe].n_planes : DEFAULT_N_PLANES; > > - output = igt_get_single_output_for_pipe(&data->display, pipe); > - igt_require(output); > - > if (!opt.user_seed) > opt.seed = time(NULL); > > @@ -381,30 +370,43 @@ test_plane_position(data_t *data, enum pipe pipe, uint64_t modifier) > n_planes, modifier); > } > > -static void > -run_tests_for_pipe(data_t *data, enum pipe pipe) > +static void run_test(data_t *data, uint64_t modifier) > { > - igt_fixture { > - igt_require_pipe(&data->display, pipe); > - igt_require(data->display.pipes[pipe].n_planes > 0); > - } > - > - igt_subtest_f("atomic-pipe-%s-tiling-x", kmstest_pipe_name(pipe)) > - test_plane_position(data, pipe, I915_FORMAT_MOD_X_TILED); > - > - igt_subtest_f("atomic-pipe-%s-tiling-y", kmstest_pipe_name(pipe)) > - test_plane_position(data, pipe, I915_FORMAT_MOD_Y_TILED); > + enum pipe pipe; > + igt_output_t *output; > > - igt_subtest_f("atomic-pipe-%s-tiling-yf", kmstest_pipe_name(pipe)) > - test_plane_position(data, pipe, I915_FORMAT_MOD_Yf_TILED); > + if (!igt_display_has_format_mod(&data->display, DRM_FORMAT_XRGB8888, modifier)) > + return; > > - igt_subtest_f("atomic-pipe-%s-tiling-4", kmstest_pipe_name(pipe)) > - test_plane_position(data, pipe, I915_FORMAT_MOD_4_TILED); > + for_each_pipe_with_valid_output(&data->display, pipe, output) { > + igt_display_reset(&data->display); > > - igt_subtest_f("atomic-pipe-%s-tiling-none", kmstest_pipe_name(pipe)) > - test_plane_position(data, pipe, DRM_FORMAT_MOD_LINEAR); > + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name) > + test_plane_position(data, pipe, output, modifier); > + } > } > > +static const struct { > + const char *name; > + uint64_t modifier; > +} subtests[] = { > + { .name = "tiling-none", > + .modifier = DRM_FORMAT_MOD_LINEAR, > + }, > + { .name = "tiling-x", > + .modifier = I915_FORMAT_MOD_X_TILED, > + }, > + { .name = "tiling-y", > + .modifier = I915_FORMAT_MOD_Y_TILED, > + }, > + { .name = "tiling-yf", > + .modifier = I915_FORMAT_MOD_Yf_TILED, > + }, > + { .name = "tiling-4", > + .modifier = I915_FORMAT_MOD_4_TILED, > + }, > +}; > + > static data_t data; > > static int opt_handler(int option, int option_index, void *input) > @@ -447,26 +449,25 @@ struct option long_options[] = { > > igt_main_args("", long_options, help_str, opt_handler, NULL) > { > - enum pipe pipe; > - > igt_fixture { > data.drm_fd = drm_open_driver_master(DRIVER_ANY); > kmstest_set_vt_graphics_mode(); > igt_require_pipe_crc(data.drm_fd); > igt_display_require(&data.display, data.drm_fd); > igt_require(data.display.is_atomic); > + igt_display_require_output(&data.display); > } > > - for_each_pipe_static(pipe) { > + for (int i = 0; i < ARRAY_SIZE(subtests); i++) { > igt_describe("Check that the kernel handles atomic updates of " > "multiple planes correctly by changing their " > "geometry and making sure the changes are " > "reflected immediately after each commit."); > - igt_subtest_group > - run_tests_for_pipe(&data, pipe); > + > + igt_subtest_with_dynamic(subtests[i].name) > + run_test(&data, subtests[i].modifier); > } > > - igt_fixture { > + igt_fixture > igt_display_fini(&data.display); > - } > }