[PATCH i-g-t 8/8] tests/kms_properties: Create dynamic subtests
B, Jeevan
jeevan.b at intel.com
Wed Jun 12 11:47:15 UTC 2024
LGTM.
Reviewed-by: Jeevan B <jeevan.b at intel.com>
> -----Original Message-----
> From: igt-dev <igt-dev-bounces at lists.freedesktop.org> On Behalf Of
> Bhanuprakash Modem
> Sent: Tuesday, June 11, 2024 10:24 AM
> To: igt-dev at lists.freedesktop.org
> Cc: Thasleem, Mohammed <mohammed.thasleem at intel.com>; Modem,
> Bhanuprakash <bhanuprakash.modem at intel.com>
> Subject: [PATCH i-g-t 8/8] tests/kms_properties: Create dynamic subtests
>
> From: Mohammed Thasleem <mohammed.thasleem at intel.com>
>
> 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.
> v7: (Bhanu)
> - Rebase
> - Handle disconnected outputs
>
> Signed-off-by: Mohammed Thasleem <mohammed.thasleem at intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> ---
> tests/kms_properties.c | 188 +++++++++++++++++++----------------------
> 1 file changed, 88 insertions(+), 100 deletions(-)
>
> diff --git a/tests/kms_properties.c b/tests/kms_properties.c index
> bd414f534..17e6c0471 100644
> --- a/tests/kms_properties.c
> +++ b/tests/kms_properties.c
> @@ -268,95 +268,76 @@ 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) {
> - igt_display_reset(display);
> -
> - igt_output_set_pipe(output, pipe);
> - if (!intel_pipe_output_combo_valid(display))
> - continue;
> + for_each_pipe_with_single_output(display, pipe, output) {
> + igt_display_reset(display);
>
> - found_any = found = true;
> + igt_output_set_pipe(output, pipe);
> + if (!intel_pipe_output_combo_valid(display))
> + continue;
>
> + 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_pipe_with_single_output(display, pipe, output) {
> + igt_display_reset(display);
>
> - for_each_valid_output_on_pipe(display, pipe, output) {
> - igt_display_reset(display);
> -
> - igt_output_set_pipe(output, pipe);
> - if (!intel_pipe_output_combo_valid(display))
> - continue;
> -
> - found_any_valid_pipe = found = true;
> + igt_output_set_pipe(output, pipe);
> + if (!intel_pipe_output_combo_valid(display))
> + continue;
>
> + 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) {
> - int i;
> enum pipe pipe;
> igt_output_t *output;
>
> - if (atomic)
> - igt_skip_on(!display->is_atomic);
> -
> for_each_connected_output(display, output) {
> - bool found = false;
> + igt_display_reset(display);
>
> for_each_pipe(display, pipe) {
> if (!igt_pipe_connector_valid(pipe, output))
> continue;
>
> - igt_display_reset(display);
> -
> igt_output_set_pipe(output, pipe);
> - if (!intel_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display)) {
> + igt_output_set_pipe(output, PIPE_NONE);
> continue;
> + }
> +
> + igt_dynamic_f("pipe-%s-%s",
> kmstest_pipe_name(pipe),
> + igt_output_name(output)) {
> + run_connector_property_tests(display, pipe,
> output, atomic);
> + }
>
> - found = true;
> - 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++)
> - if (!igt_output_is_connected(&display->outputs[i]))
> - run_connector_property_tests(display, PIPE_NONE,
> &display->outputs[i], atomic);
> + for_each_disconnected_output(display, output) {
> + igt_display_reset(display);
> +
> + igt_dynamic_f("pipe-None-%s", igt_output_name(output))
> + run_connector_property_tests(display, PIPE_NONE,
> output, atomic);
> +
> + }
> }
>
> static void test_invalid_properties(int fd, @@ -424,7 +405,6 @@ static void
> test_object_invalid_properties(igt_display_t *display,
> igt_output_t *output;
> igt_plane_t *plane;
> enum pipe pipe;
> - int i;
>
> for_each_pipe(display, pipe)
> test_invalid_properties(display->drm_fd, id, type, display-
> >pipes[pipe].crtc_id, DRM_MODE_OBJECT_CRTC, atomic); @@ -433,7 +413,7
> @@ static void test_object_invalid_properties(igt_display_t *display,
> for_each_plane_on_pipe(display, pipe, plane)
> test_invalid_properties(display->drm_fd, id, type,
> plane->drm_plane->plane_id, DRM_MODE_OBJECT_PLANE, atomic);
>
> - for (i = 0, output = &display->outputs[0]; i < display->n_outputs;
> output = &display->outputs[++i])
> + for_each_output(display, output)
> test_invalid_properties(display->drm_fd, id, type, output->id,
> DRM_MODE_OBJECT_CONNECTOR, atomic); }
>
> @@ -763,7 +743,6 @@ 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);
> @@ -775,13 +754,33 @@ static void invalid_properties(igt_display_t
> *display, bool atomic)
> for_each_plane_on_pipe(display, pipe, plane)
> test_object_invalid_properties(display, plane-
> >drm_plane->plane_id, DRM_MODE_OBJECT_PLANE, atomic);
>
> - for (i = 0, output = &display->outputs[0]; i < display->n_outputs;
> output = &display->outputs[++i])
> + for_each_output(display, output)
> 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" },
> + };
>
> igt_fixture {
> display.drm_fd = drm_open_driver_master(DRIVER_ANY);
> @@ -791,59 +790,48 @@ 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");
> + 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_subtest("invalid-properties-atomic")
> - invalid_properties(&display, true);
> + tests[i].func(&display, tests->atomic);
> + }
> + }
>
> - 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);
> + igt_subtest_group {
> + 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);
> }
>
> - 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_subtest_group {
> + 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.43.2
More information about the igt-dev
mailing list