Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF1DF10E70C for ; Mon, 10 Oct 2022 20:17:47 +0000 (UTC) From: Mohammed Thasleem To: igt-dev@lists.freedesktop.org Date: Tue, 11 Oct 2022 01:41:29 +0530 Message-Id: <20221010201130.35343-2-mohammed.thasleem@intel.com> In-Reply-To: <20221010201130.35343-1-mohammed.thasleem@intel.com> References: <20221010201130.35343-1-mohammed.thasleem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH v6 1/2] tests/kms_properties: Create dynamic subtests List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Modified kms_properties to include dynamic test cases. v2: Fixed compilation issue. v3: Removed redundant code. v4: Moved get_prop_sanity calls to igt_subtest_group. v5: Replace for loop with for_each_disconnected_output. v6: Moved cleanup part to igt cleanup patch. Signed-off-by: Mohammed Thasleem --- tests/kms_properties.c | 163 ++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 91 deletions(-) diff --git a/tests/kms_properties.c b/tests/kms_properties.c index 2958efac..bcc8fbdd 100644 --- a/tests/kms_properties.c +++ b/tests/kms_properties.c @@ -230,48 +230,28 @@ static void run_connector_property_tests(igt_display_t *display, enum pipe pipe, static void plane_properties(igt_display_t *display, bool atomic) { - bool found_any = false, found; igt_output_t *output; enum pipe pipe; - if (atomic) - igt_skip_on(!display->is_atomic); - - for_each_pipe(display, pipe) { - found = false; - - for_each_valid_output_on_pipe(display, pipe, output) { - found_any = found = true; - + for_each_pipe_with_single_output(display, pipe, output) { + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), + igt_output_name(output)) { run_plane_property_tests(display, pipe, output, atomic); - break; } } - - igt_skip_on(!found_any); } static void crtc_properties(igt_display_t *display, bool atomic) { - bool found_any_valid_pipe = false, found; enum pipe pipe; igt_output_t *output; - if (atomic) - igt_skip_on(!display->is_atomic); - - for_each_pipe(display, pipe) { - found = false; - - for_each_valid_output_on_pipe(display, pipe, output) { - found_any_valid_pipe = found = true; - + for_each_pipe_with_single_output(display, pipe, output) { + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), + igt_output_name(output)) { run_crtc_property_tests(display, pipe, output, atomic); - break; } } - - igt_skip_on(!found_any_valid_pipe); } static void connector_properties(igt_display_t *display, bool atomic) @@ -280,22 +260,19 @@ static void connector_properties(igt_display_t *display, bool atomic) enum pipe pipe; igt_output_t *output; - if (atomic) - igt_skip_on(!display->is_atomic); - for_each_connected_output(display, output) { - bool found = false; for_each_pipe(display, pipe) { if (!igt_pipe_connector_valid(pipe, output)) continue; - found = true; - run_connector_property_tests(display, pipe, output, atomic); - break; + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), + igt_output_name(output)) { + run_connector_property_tests(display, pipe, output, atomic); + } } + break; - igt_assert_f(found, "Connected output should have at least 1 valid crtc\n"); } for (i = 0; i < display->n_outputs; i++) @@ -707,25 +684,56 @@ static void invalid_properties(igt_display_t *display, bool atomic) igt_output_t *output; igt_plane_t *plane; enum pipe pipe; - int i; - - if (atomic) - igt_skip_on(!display->is_atomic); for_each_pipe(display, pipe) - test_object_invalid_properties(display, display->pipes[pipe].crtc_id, DRM_MODE_OBJECT_CRTC, atomic); + igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)) + test_object_invalid_properties(display, display->pipes[pipe].crtc_id, + DRM_MODE_OBJECT_CRTC, atomic); for_each_pipe(display, pipe) - for_each_plane_on_pipe(display, pipe, plane) - test_object_invalid_properties(display, plane->drm_plane->plane_id, DRM_MODE_OBJECT_PLANE, atomic); + igt_dynamic_f("pipe-%s-plane", kmstest_pipe_name(pipe)) + for_each_plane_on_pipe(display, pipe, plane) + test_object_invalid_properties(display, plane->drm_plane->plane_id, + DRM_MODE_OBJECT_PLANE, atomic); + + for_each_output(display, output) + igt_dynamic_f("%s", igt_output_name(output)) + test_object_invalid_properties(display, output->id, + DRM_MODE_OBJECT_CONNECTOR, atomic); - for (i = 0, output = &display->outputs[0]; i < display->n_outputs; output = &display->outputs[++i]) - test_object_invalid_properties(display, output->id, DRM_MODE_OBJECT_CONNECTOR, atomic); } igt_main { igt_display_t display; + int i; + static const struct { + const char *name; + void (*func)(igt_display_t *, bool); + const bool atomic; + const char *desc; + } tests[] = { + { "plane-properties-legacy", plane_properties, false, + "Tests plane properties with legacy commit" }, + { "plane-properties-atomic", plane_properties, true, + "Tests plane properties with atomic commit" }, + { "crtc-properties-legacy", crtc_properties, false, + "Tests crtc properties with legacy commit" }, + { "crtc-properties-atomic", crtc_properties, true, + "Tests crtc properties with atomic commit" }, + { "connector-properties-legacy", connector_properties, false, + "Tests connector properties with legacy commit" }, + { "connector-properties-atomic", connector_properties, true, + "Tests connector properties with atomic commit" }, + { "invalid-properties-legacy", invalid_properties, false, + "Checks each property of any type with combination of mode " + "object with legacy commit and make sure only valid properties " + "are set to mode object else return with relevant error" }, + { "invalid-properties-atomic", invalid_properties, true, + "Checks each property of any type with combination of mode object " + "with atomic commit and make sure only valid properties are set to " + "mode object else return with relevant error" }, + }; igt_fixture { display.drm_fd = drm_open_driver_master(DRIVER_ANY); @@ -735,59 +743,32 @@ igt_main igt_display_require(&display, display.drm_fd); } - igt_describe("Tests plane properties with legacy commit"); - igt_subtest("plane-properties-legacy") - plane_properties(&display, false); - - igt_describe("Tests plane properties with atomic commit"); - igt_subtest("plane-properties-atomic") - plane_properties(&display, true); - - igt_describe("Tests crtc properties with legacy commit"); - igt_subtest("crtc-properties-legacy") - crtc_properties(&display, false); - - igt_describe("Tests crtc properties with atomic commit"); - igt_subtest("crtc-properties-atomic") - crtc_properties(&display, true); - - igt_describe("Tests connector properties with legacy commit"); - igt_subtest("connector-properties-legacy") - connector_properties(&display, false); - - igt_describe("Tests connector properties with atomic commit"); - igt_subtest("connector-properties-atomic") - connector_properties(&display, true); - - igt_describe("Checks each property of any type with combination of mode object with legacy " - "commit and make sure only valid properties are set to mode object else " - "return with relevant error"); - - igt_subtest("invalid-properties-legacy") - invalid_properties(&display, false); - - igt_describe("Checks each property of any type with combination of mode object with atomic " - "commit and make sure only valid properties are set to mode object else " - "return with relevant error"); - - igt_subtest("invalid-properties-atomic") - invalid_properties(&display, true); + for (i = 0; i < ARRAY_SIZE(tests); i++) { + igt_describe_f("%s\n", tests[i].desc); + igt_subtest_with_dynamic_f("%s", tests[i].name) { + if (tests->atomic && !display.is_atomic) + continue; - igt_describe("Test validates the properties of all planes, crtc and connectors with atomic commit"); - igt_subtest("get_properties-sanity-atomic") { - igt_skip_on(!display.is_atomic); - get_prop_sanity(&display, true); + tests[i].func(&display, tests->atomic); + } } - igt_describe("Test validates the properties of all planes, crtc and connectors with legacy commit"); - igt_subtest("get_properties-sanity-non-atomic") { - if (display.is_atomic) - igt_assert_eq(drmSetClientCap(display.drm_fd, DRM_CLIENT_CAP_ATOMIC, 0), 0); + igt_subtest_group { + igt_describe("Test validates the properties of all planes, crtc and connectors with legacy commit"); + igt_subtest("get_properties-sanity-non-atomic") { + if (display.is_atomic) + igt_assert_eq(drmSetClientCap(display.drm_fd, DRM_CLIENT_CAP_ATOMIC, 0), 0); + get_prop_sanity(&display, false); + if (display.is_atomic) + igt_assert_eq(drmSetClientCap(display.drm_fd, DRM_CLIENT_CAP_ATOMIC, 1), 0); + } - get_prop_sanity(&display, false); + igt_fixture + igt_require(display.is_atomic); - if (display.is_atomic) - igt_assert_eq(drmSetClientCap(display.drm_fd, DRM_CLIENT_CAP_ATOMIC, 1), 0); + igt_describe("Test validates the properties of all planes, crtc and connectors with atomic commit"); + igt_subtest("get_properties-sanity-atomic") + get_prop_sanity(&display, true); } igt_fixture { -- 2.25.1