[igt-dev] [PATCH i-g-t v2] tests/kms_atomic: add test to validate immutable zpos
Swati Sharma
swati2.sharma at intel.com
Thu Mar 12 07:51:26 UTC 2020
i915 implements immutable zpos property whereas the existing test
case is written to validate mutable zpos.
Added new sub-test to validate immutable zpos. In the test, to validate
reported zpos of the plane is correct by making sure a full-screen plane
covers all other planes with the lower zpos, and the plane with the next
available zpos is indeed partially covering the full-screen plane.
v2: -Removed intel only checks [Martin]
-Used XRGB8888 pixel format as used in other IGTs
-Added documentation [Martin]
-Removed skip, instead continue if plane doesn't support zpos [Martin]
-Sorted planes in increasing order of zpos [Martin]
Issue: https://gitlab.freedesktop.org/drm/intel/issues/404
Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
---
tests/kms_atomic.c | 156 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 146 insertions(+), 10 deletions(-)
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 8462d128..2a6a407e 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -121,7 +121,7 @@ static void plane_check_current_state(igt_plane_t *plane, const uint64_t *values
}
static void plane_commit(igt_plane_t *plane, enum igt_commit_style s,
- enum kms_atomic_check_relax relax)
+ enum kms_atomic_check_relax relax)
{
igt_display_commit2(plane->pipe->display, s);
plane_check_current_state(plane, plane->values, relax);
@@ -277,9 +277,9 @@ static uint32_t plane_get_igt_format(igt_plane_t *plane)
}
static void
-plane_primary_overlay_zpos(igt_pipe_t *pipe, igt_output_t *output,
- igt_plane_t *primary, igt_plane_t *overlay,
- uint32_t format_primary, uint32_t format_overlay)
+plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
+ igt_plane_t *primary, igt_plane_t *overlay,
+ uint32_t format_primary, uint32_t format_overlay)
{
struct igt_fb fb_primary, fb_overlay;
drmModeModeInfo *mode = igt_output_get_mode(output);
@@ -320,7 +320,7 @@ plane_primary_overlay_zpos(igt_pipe_t *pipe, igt_output_t *output,
igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 1);
igt_info("Committing with overlay on top, it has a hole "\
- "through which the primary should be seen\n");
+ "through which the primary should be seen\n");
plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 0);
@@ -346,7 +346,7 @@ plane_primary_overlay_zpos(igt_pipe_t *pipe, igt_output_t *output,
igt_put_cairo_ctx(pipe->display->drm_fd, &fb_primary, cr);
igt_info("Committing with a hole in the primary through "\
- "which the underlay should be seen\n");
+ "which the underlay should be seen\n");
plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* reset it back to initial state */
@@ -358,6 +358,127 @@ plane_primary_overlay_zpos(igt_pipe_t *pipe, igt_output_t *output,
igt_assert_eq_u64(igt_plane_get_prop(overlay, IGT_PLANE_ZPOS), 1);
}
+static void
+plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
+ igt_output_t *output)
+{
+ cairo_t *cr;
+ int min_idx;
+ struct igt_fb fb_ref;
+ igt_plane_t *primary;
+ drmModeModeInfo *mode;
+ igt_pipe_crc_t *pipe_crc;
+ igt_crc_t ref_crc, new_crc;
+ int n_planes = pipe->n_planes;
+ igt_plane_t *plane_ptr[n_planes];
+ igt_plane_t *plane_lower, *plane_upper;
+ uint32_t w_lower, h_lower, w_upper, h_upper;
+
+ mode = igt_output_get_mode(output);
+ primary = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
+
+ /* for lower plane */
+ w_lower = mode->hdisplay;
+ h_lower = mode->vdisplay;
+
+ /* for upper plane */
+ w_upper = mode->hdisplay / 2;
+ h_upper = mode->vdisplay / 2;
+
+ igt_create_color_fb(display->drm_fd,
+ w_lower, h_lower,
+ DRM_FORMAT_XRGB8888,
+ I915_TILING_NONE,
+ 0.0, 0.0, 0.0, &fb_ref);
+
+ /* create reference image */
+ cr = igt_get_cairo_ctx(display->drm_fd, &fb_ref);
+ igt_assert(cairo_status(cr) == 0);
+ igt_paint_color(cr, 0, 0, w_lower, h_lower, 0.0, 0.0, 1.0);
+ igt_paint_color(cr, w_upper / 2, h_upper / 2, w_upper, h_upper, 1.0, 1.0, 0.0);
+ igt_put_cairo_ctx(display->drm_fd, &fb_ref, cr);
+ igt_plane_set_fb(primary, &fb_ref);
+ igt_display_commit2(display, COMMIT_ATOMIC);
+
+ /* create the pipe_crc object for this pipe */
+ pipe_crc = igt_pipe_crc_new(pipe->display->drm_fd, pipe->pipe,
+ INTEL_PIPE_CRC_SOURCE_AUTO);
+
+ /* get reference crc */
+ igt_pipe_crc_start(pipe_crc);
+ igt_pipe_crc_get_current(display->drm_fd, pipe_crc, &ref_crc);
+
+ igt_plane_set_fb(primary, NULL);
+
+ /* sort planes in increasing order of zpos */
+ for (int k = 0; k < n_planes; k++)
+ plane_ptr[k] = &display->pipes[pipe->pipe].planes[k];
+
+ for (int l = 0; l < n_planes - 1; l++) {
+ min_idx = l;
+ for (int m = l + 1; m < n_planes; m++) {
+ int zpos1, zpos2;
+
+ if (!igt_plane_has_prop(plane_ptr[min_idx], IGT_PLANE_ZPOS) ||
+ !igt_plane_has_prop(plane_ptr[m], IGT_PLANE_ZPOS))
+ continue;
+
+ zpos1 = igt_plane_get_prop(plane_ptr[min_idx], IGT_PLANE_ZPOS);
+ zpos2 = igt_plane_get_prop(plane_ptr[m], IGT_PLANE_ZPOS);
+
+ if (zpos1 == zpos2)
+ continue;
+
+ if (zpos2 < zpos1)
+ min_idx = m;
+ }
+
+ igt_swap(plane_ptr[min_idx], plane_ptr[l]);
+ }
+
+ /* checking only pairs of plane in increasing fashion
+ * to avoid combinatorial explosion
+ */
+ for (int i = 0; i < n_planes - 1; i++) {
+ struct igt_fb fb_lower, fb_upper;
+
+ plane_lower = plane_ptr[i];
+ plane_upper = plane_ptr[i + 1];
+
+ if ((plane_lower->type == DRM_PLANE_TYPE_CURSOR) ||
+ (plane_upper->type == DRM_PLANE_TYPE_CURSOR))
+ continue;
+
+ igt_create_color_fb(display->drm_fd,
+ w_lower, h_lower,
+ DRM_FORMAT_XRGB8888,
+ I915_TILING_NONE,
+ 0.0, 0.0, 1.0, &fb_lower);
+
+ igt_create_color_fb(display->drm_fd,
+ w_upper, h_upper,
+ DRM_FORMAT_XRGB8888,
+ I915_TILING_NONE,
+ 1.0, 1.0, 0.0, &fb_upper);
+
+ igt_plane_set_position(plane_lower, 0, 0);
+ igt_plane_set_fb(plane_lower, &fb_lower);
+
+ igt_plane_set_position(plane_upper, w_upper / 2, h_upper / 2);
+ igt_plane_set_fb(plane_upper, &fb_upper);
+
+ igt_info("Committing with the plane[%d] underneath "\
+ "plane[%d]\n", i, (i + 1));
+ igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_pipe_crc_get_current(pipe->display->drm_fd, pipe_crc, &new_crc);
+
+ igt_assert_crc_equal(&ref_crc, &new_crc);
+
+ igt_plane_set_fb(plane_lower, NULL);
+ igt_plane_set_fb(plane_upper, NULL);
+ }
+}
+
static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *plane)
{
drmModeModeInfo *mode = igt_output_get_mode(output);
@@ -987,14 +1108,18 @@ igt_main
plane_primary(pipe_obj, primary, &fb);
}
- igt_subtest("plane_primary_overlay_zpos") {
+ igt_describe("Tests mutable zpos where zpos is modified for "\
+ "primary and overlay planes, order of planes is validated "\
+ "visually where top plane has hole through which underlay plane "\
+ "can be seen");
+ igt_subtest("plane_primary_overlay_mutable_zpos") {
uint32_t format_primary = DRM_FORMAT_ARGB8888;
uint32_t format_overlay = DRM_FORMAT_ARGB1555;
igt_plane_t *overlay =
igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
-
igt_require(overlay);
+
igt_require(igt_plane_has_prop(primary, IGT_PLANE_ZPOS));
igt_require(igt_plane_has_prop(overlay, IGT_PLANE_ZPOS));
@@ -1002,8 +1127,18 @@ igt_main
igt_require(igt_plane_has_format_mod(overlay, format_overlay, 0x0));
igt_output_set_pipe(output, pipe);
- plane_primary_overlay_zpos(pipe_obj, output, primary, overlay,
- format_primary, format_overlay);
+ plane_primary_overlay_mutable_zpos(pipe_obj, output, primary, overlay,
+ format_primary, format_overlay);
+ }
+
+ igt_describe("Tests immutable zpos where zpos cannot be modified such that "\
+ "reported zpos of the plane is correct by making sure a "\
+ "full-screen plane covers all other planes with the lower zpos,"\
+ "and the plane with the next available zpos is indeed partially "\
+ "covering the full-screen plane");
+ igt_subtest("plane_immutable_zpos") {
+ igt_output_set_pipe(output, pipe);
+ plane_immutable_zpos(&display, pipe_obj, output);
}
igt_subtest("test_only") {
@@ -1011,6 +1146,7 @@ igt_main
test_only(pipe_obj, primary, output);
}
+
igt_subtest("plane_cursor_legacy") {
igt_plane_t *cursor =
igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_CURSOR);
--
2.25.1
More information about the igt-dev
mailing list