[igt-dev] [PATCH i-g-t] tests/kms_properties: Create dynamic subtests
Modem, Bhanuprakash
bhanuprakash.modem at intel.com
Thu Sep 29 14:26:58 UTC 2022
On Wed-28-09-2022 07:07 pm, Mohammed Thasleem wrote:
> 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.
>
> Signed-off-by: Mohammed Thasleem <mohammed.thasleem at intel.com>
> ---
> tests/kms_properties.c | 172 ++++++++++++++++++-----------------------
> 1 file changed, 75 insertions(+), 97 deletions(-)
>
> diff --git a/tests/kms_properties.c b/tests/kms_properties.c
> index dd5a93aa..476769e0 100644
> --- a/tests/kms_properties.c
> +++ b/tests/kms_properties.c
> @@ -230,48 +230,30 @@ 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_valid_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;
> }
> + 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_valid_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;
> }
> + break;
> }
> -
> - igt_skip_on(!found_any_valid_pipe);
> }
>
> static void connector_properties(igt_display_t *display, bool atomic)
> @@ -280,22 +262,12 @@ 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;
> + for_each_pipe_with_valid_output(display, pipe, output) {
> + 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");
> + break;
> }
>
> for (i = 0; i < display->n_outputs; i++)
> @@ -707,26 +679,58 @@ 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_connected_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);
Please fix the same inside test_object_invalid_properties()
use for_each_connected_output()
> }
>
> igt_main
> {
> igt_display_t display;
>
> + static const struct {
> + const char *name;
> + void (*func)(igt_display_t *, bool);
> + const bool atomic;
> + const char *desc;
> + } funcs[] = {
> + { "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" },
https://cgit.freedesktop.org/drm/igt-gpu-tools/tree/tests/kms_properties.c#n301
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);
I can recommend to create a new api for_each_output() to iterate all
outputs.
> + { "connector-properties-atomic", connector_properties, true,
> + "Tests connector properties with atomic commit" },
As these tests are trying to use igt_output_set_pipe(), we must sanitize
the state before using it.
> + { "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" },
> + { }
Please drop this extra element.
> + }, *f;
> +
> igt_fixture {
> display.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> @@ -735,62 +739,36 @@ 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 (f = funcs; f->name; f++) {
> + igt_describe_f("%s\n", f->desc);
> + igt_subtest_with_dynamic_f("%s", f->name) {
> + if (f->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);
> + f->func(&display, f->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);
It seems, get_prop_sanity() is just using display->drm_fd only, so no
need to send full display structure.
- Bhanu
> + 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 {
> igt_display_fini(&display);
> + close(display.drm_fd);
> }
> }
More information about the igt-dev
mailing list