[igt-dev] [PATCH RFC i-g-t 3/8] tests/kms_universal_plane: decouple verification of re-enabling primary plane

Alaa Emad
2022-11-11T09:12:38Z

decouple verification of re-enable primary plane in a separated subtests
to be able to run it individually, creating the function.

Signed-off-by: Alaa Emad <aemad@igalia.com>
---
tests/kms_universal_plane.c | 67 +++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)

diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 9a77ea77..bd374464 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -234,6 +234,68 @@ test_disable_primary_red_sprite(data_t *data, enum pipe pipe, igt_output_t *outp
functional_test_fini(&test, output);
}

+static void
+test_re_enable_primary_with_blue(data_t *data, enum pipe pipe, igt_output_t *output)
+{
+ functional_test_t test = { .data = data };
+ igt_display_t *display = &data->display;
+ igt_plane_t *primary, *sprite;
+ int num_primary = 0, num_cursor = 0;
+ int i;
+
+ igt_require_pipe(display, pipe);
+
+ igt_info("Testing connector %s using pipe %s\n", igt_output_name(output),
+ kmstest_pipe_name(pipe));
+
+ functional_test_init(&test, output, pipe);
+
+ /*
+ * Make sure we have no more than one primary or cursor plane per crtc.
+ * If the kernel accidentally calls drm_plane_init() rather than
+ * drm_universal_plane_init(), the type enum can get interpreted as a
+ * boolean and show up in userspace as the wrong type.
+ */
+ for (i = 0; i < display->pipes[pipe].n_planes; i++)
+ if (display->pipes[pipe].planes[i].type == DRM_PLANE_TYPE_PRIMARY)
+ num_primary++;
+ else if (display->pipes[pipe].planes[i].type == DRM_PLANE_TYPE_CURSOR)
+ num_cursor++;
+
+ igt_warn_on(num_primary != 1);
+ igt_warn_on(num_cursor > 1);
+
+ primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+ sprite = igt_output_get_plane_type(output, DRM_PLANE_TYPE_OVERLAY);
+ if (!sprite) {
+ functional_test_fini(&test, output);
+ igt_skip("No sprite plane available\n");
+ }
+
+ igt_plane_set_position(sprite, 100, 100);
+
+ /* Step 2: Legacy API', blue primary, red sprite (CRC 2) */
+ igt_plane_set_fb(primary, &test.blue_fb);
+ igt_plane_set_fb(sprite, &test.red_fb);
+ igt_display_commit2(display, COMMIT_LEGACY);
+ igt_pipe_crc_collect_crc(test.pipe_crc, &test.crc_2);
+
+ igt_plane_set_fb(primary, NULL);
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ /* Step 6: Universal API's, re-enable primary with blue (CRC 6) */
+ igt_plane_set_fb(primary, &test.blue_fb);
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ igt_pipe_crc_collect_crc(test.pipe_crc, &test.crc_6);
+
+ /* Re-enabling primary should return to blue properly */
+ igt_assert_crc_equal(&test.crc_2, &test.crc_6);
+
+ igt_plane_set_fb(primary, NULL);
+ igt_plane_set_fb(sprite, NULL);
+
+ functional_test_fini(&test, output);
+}

/*
* Universal plane functional testing.
@@ -917,6 +979,11 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
for_each_valid_output_on_pipe(&data->display, pipe, output)
test_disable_primary_red_sprite(data, pipe, output);

+ igt_subtest_f("re-enable-primary-with-blue-%s",
+ kmstest_pipe_name(pipe))
+ for_each_valid_output_on_pipe(&data->display, pipe, output)
+ test_re_enable_primary_with_blue(data, pipe, output);