* [igt-dev] [PATCH i-g-t v2 1/2] tests/kms_atomic: Test cleanup
@ 2022-10-13 5:58 Swati Sharma
2022-10-13 5:58 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic Swati Sharma
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Swati Sharma @ 2022-10-13 5:58 UTC (permalink / raw)
To: igt-dev
Removed unnecessary newlines and comments.
Sanitize the system state before starting the subtest.
v2: -As thumb rule, all comments should start from uppercase.
-Corrected multiline comments
v3: -Split patch into 2 patches
-Avoid skips inside test
-Cleanup after subtest executes
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
---
tests/kms_atomic.c | 319 ++++++++++++++++++++++++---------------------
1 file changed, 168 insertions(+), 151 deletions(-)
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 831ba2587..535ae2ed7 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -27,10 +27,6 @@
* Pekka Paalanen <pekka.paalanen@collabora.co.uk>
*/
-/*
- * Testcase: testing atomic modesetting API
- */
-
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -54,7 +50,7 @@
#define DRM_CAP_CURSOR_HEIGHT 0x9
#endif
-IGT_TEST_DESCRIPTION("Test atomic modesetting API");
+IGT_TEST_DESCRIPTION("Test atomic modesetting API.");
enum kms_atomic_check_relax {
ATOMIC_RELAX_NONE = 0,
@@ -72,7 +68,6 @@ static inline int damage_rect_height(struct drm_mode_rect *r)
return r->y2 - r->y1;
}
-
static bool plane_filter(enum igt_atomic_plane_properties prop)
{
if ((1 << prop) & IGT_PLANE_COORD_CHANGED_MASK)
@@ -119,8 +114,10 @@ static void plane_check_current_state(igt_plane_t *plane, const uint64_t *values
plane_get_current_state(plane, current_values);
- /* Legacy cursor ioctls create their own, unknowable, internal
- * framebuffer which we can't reason about. */
+ /*
+ * Legacy cursor ioctls create their own, unknowable, internal
+ * framebuffer which we can't reason about.
+ */
if (relax & PLANE_RELAX_FB)
current_values[IGT_PLANE_FB_ID] = values[IGT_PLANE_FB_ID];
@@ -145,9 +142,7 @@ static void plane_commit_atomic_err(igt_plane_t *plane,
uint64_t current_values[IGT_NUM_PLANE_PROPS];
plane_get_current_state(plane, current_values);
-
igt_assert_eq(-err, igt_display_try_commit2(plane->pipe->display, COMMIT_ATOMIC));
-
plane_check_current_state(plane, current_values, relax);
}
@@ -186,7 +181,6 @@ static void crtc_check_current_state(igt_pipe_t *pipe,
if (pipe_values[IGT_CRTC_MODE_ID]) {
mode_prop = drmModeGetPropertyBlob(pipe->display->drm_fd,
pipe_values[IGT_CRTC_MODE_ID]);
-
igt_assert(mode_prop);
igt_assert_eq(mode_prop->length,
@@ -218,15 +212,16 @@ static void crtc_check_current_state(igt_pipe_t *pipe,
crtc_get_current_state(pipe, current_pipe_values);
- /* Optionally relax the check for MODE_ID: using the legacy SetCrtc
+ /*
+ * Optionally relax the check for MODE_ID: using the legacy SetCrtc
* API can potentially change MODE_ID even if the mode itself remains
- * unchanged. */
+ * unchanged.
+ */
if (relax & CRTC_RELAX_MODE && mode && current_pipe_values[IGT_CRTC_MODE_ID] &&
current_pipe_values[IGT_CRTC_MODE_ID] != pipe_values[IGT_CRTC_MODE_ID]) {
drmModePropertyBlobRes *cur_prop =
drmModeGetPropertyBlob(pipe->display->drm_fd,
current_pipe_values[IGT_CRTC_MODE_ID]);
-
igt_assert(cur_prop);
igt_assert_eq(cur_prop->length, sizeof(struct drm_mode_modeinfo));
@@ -296,11 +291,11 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
drmModeModeInfo *mode = igt_output_get_mode(output);
cairo_t *cr;
- /* for primary */
+ /* For primary plane */
uint32_t w = mode->hdisplay;
uint32_t h = mode->vdisplay;
- /* for overlay */
+ /* For overlay plane */
uint32_t w_overlay = mode->hdisplay / 2;
uint32_t h_overlay = mode->vdisplay / 2;
@@ -360,7 +355,7 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
"which the underlay should be seen\n");
plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* reset it back to initial state */
+ /* Reset it back to initial state */
igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 0);
igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 1);
plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -371,33 +366,28 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
static void
plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
- igt_output_t *output)
+ igt_output_t *output, igt_plane_t *primary, int n_planes)
{
cairo_t *cr;
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 fb_id_lower, fb_id_upper;
- int n_planes = pipe->n_planes;
igt_plane_t *plane_ptr[n_planes];
struct igt_fb fb_lower, fb_upper;
uint32_t w_lower, h_lower, w_upper, h_upper;
memset(plane_ptr, 0, n_planes * sizeof(igt_plane_t *));
- igt_require(n_planes >= 2);
igt_require_pipe_crc(display->drm_fd);
-
mode = igt_output_get_mode(output);
- primary = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
- /* for lower plane */
+ /* For lower plane */
w_lower = mode->hdisplay;
h_lower = mode->vdisplay;
- /* for upper plane */
+ /* For upper plane */
w_upper = 64;
h_upper = 64;
@@ -407,7 +397,7 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
I915_TILING_NONE,
0.0, 0.0, 0.0, &fb_ref);
- /* create reference image */
+ /* 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);
@@ -416,11 +406,11 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
igt_plane_set_fb(primary, &fb_ref);
igt_display_commit2(display, COMMIT_ATOMIC);
- /* create the pipe_crc object for this pipe */
+ /* 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 */
+ /* Get reference crc */
igt_pipe_crc_start(pipe_crc);
igt_pipe_crc_get_current(display->drm_fd, pipe_crc, &ref_crc);
@@ -456,8 +446,8 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
igt_assert(fb_id_upper);
/*
- * checking only pairs of plane in increasing fashion
- * to avoid combinatorial explosion
+ * Checking only pairs of plane in increasing fashion
+ * to avoid combinatorial explosion.
*/
for (int i = 0; i < n_planes - 1; i++) {
igt_plane_t *plane_lower, *plane_upper;
@@ -521,23 +511,29 @@ static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *p
igt_plane_set_fb(plane, &fb);
igt_plane_set_position(plane, w/2, h/2);
- /* Enable the overlay plane using the atomic API, and double-check
- * state is what we think it should be. */
+ /*
+ * Enable the overlay plane using the atomic API, and double-check
+ * state is what we think it should be.
+ */
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Disable the plane and check the state matches the old. */
+ /* Disable the plane and check the state matches the old */
igt_plane_set_fb(plane, NULL);
igt_plane_set_position(plane, 0, 0);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Re-enable the plane through the legacy plane API, and verify through
- * atomic. */
+ /*
+ * Re-enable the plane through the legacy plane API, and verify through
+ * atomic.
+ */
igt_plane_set_fb(plane, &fb);
igt_plane_set_position(plane, w/2, h/2);
plane_commit(plane, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
- /* Restore the plane to its original settings through the legacy plane
- * API, and verify through atomic. */
+ /*
+ * Restore the plane to its original settings through the legacy plane
+ * API, and verify through atomic.
+ */
igt_plane_set_fb(plane, NULL);
igt_plane_set_position(plane, 0, 0);
plane_commit(plane, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
@@ -554,8 +550,10 @@ static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *f
fb->drm_format, I915_TILING_NONE,
0.2, 0.2, 0.2, &fb2);
- /* Flip the primary plane using the atomic API, and double-check
- * state is what we think it should be. */
+ /*
+ * Flip the primary plane using the atomic API, and double-check
+ * state is what we think it should be.
+ */
igt_plane_set_fb(plane, &fb2);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -563,36 +561,35 @@ static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *f
igt_plane_set_fb(plane, fb);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Set the plane through the legacy CRTC/primary-plane API, and
- * verify through atomic. */
+ /*
+ * Set the plane through the legacy CRTC/primary-plane API, and
+ * verify through atomic.
+ */
igt_plane_set_fb(plane, &fb2);
crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
- /* Restore the plane to its original settings through the legacy CRTC
- * API, and verify through atomic. */
+ /*
+ * Restore the plane to its original settings through the legacy CRTC
+ * API, and verify through atomic.
+ */
igt_plane_set_fb(plane, fb);
crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
- /* Set the plane through the universal setplane API, and
- * verify through atomic. */
+ /*
+ * Set the plane through the universal setplane API, and
+ * verify through atomic.
+ */
igt_plane_set_fb(plane, &fb2);
plane_commit(plane, COMMIT_UNIVERSAL, ATOMIC_RELAX_NONE);
}
-/* test to ensure that DRM_MODE_ATOMIC_TEST_ONLY really only touches the
- * free-standing state objects and nothing else.
- */
-static void test_only(igt_pipe_t *pipe_obj,
- igt_plane_t *primary,
- igt_output_t *output)
+static void test_only(igt_pipe_t *pipe_obj, igt_plane_t *primary,
+ igt_output_t *output, uint32_t format)
{
drmModeModeInfo *mode = igt_output_get_mode(output);
- uint32_t format = plane_get_igt_format(primary);
struct igt_fb fb;
uint64_t old_plane_values[IGT_NUM_PLANE_PROPS], old_crtc_values[IGT_NUM_CRTC_PROPS];
- igt_require(format != 0);
-
plane_get_current_state(primary, old_plane_values);
crtc_get_current_state(pipe_obj, old_crtc_values);
@@ -606,7 +603,7 @@ static void test_only(igt_pipe_t *pipe_obj,
igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
- /* check the state, should still be old state */
+ /* Check the state, should still be old state */
crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
@@ -625,11 +622,11 @@ static void test_only(igt_pipe_t *pipe_obj,
igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
- /* for extra stress, go through dpms off/on cycle */
+ /* For extra stress, go through dpms off/on cycle */
kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_OFF);
kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_ON);
- /* check the state, should still be old state */
+ /* Check the state, should still be old state */
crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
@@ -659,8 +656,10 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
DRM_FORMAT_MOD_LINEAR,
0.0, 0.0, 0.0, &fb);
- /* Flip the cursor plane using the atomic API, and double-check
- * state is what we think it should be. */
+ /*
+ * Flip the cursor plane using the atomic API, and double-check
+ * state is what we think it should be.
+ */
igt_plane_set_fb(cursor, &fb);
igt_plane_set_position(cursor, x, y);
plane_commit(cursor, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -670,8 +669,10 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
igt_plane_set_position(cursor, 0, 0);
plane_commit(cursor, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Re-enable the plane through the legacy cursor API, and verify
- * through atomic. */
+ /*
+ * Re-enable the plane through the legacy cursor API, and verify
+ * through atomic.
+ */
igt_plane_set_fb(cursor, &fb);
igt_plane_set_position(cursor, x, y);
plane_commit(cursor, COMMIT_LEGACY, PLANE_RELAX_FB);
@@ -680,8 +681,10 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
igt_plane_set_position(cursor, x - 16, y - 16);
plane_commit(cursor, COMMIT_LEGACY, PLANE_RELAX_FB);
- /* Restore the plane to its original settings through the legacy cursor
- * API, and verify through atomic. */
+ /*
+ * Restore the plane to its original settings through the legacy cursor
+ * API, and verify through atomic.
+ */
igt_plane_set_fb(cursor, NULL);
igt_plane_set_position(cursor, 0, 0);
plane_commit(cursor, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
@@ -694,7 +697,7 @@ static void plane_invalid_params(igt_pipe_t *pipe,
{
struct igt_fb fb2;
- /* Pass a series of invalid object IDs for the FB ID. */
+ /* Pass a series of invalid object IDs for the FB ID */
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, plane->drm_plane->plane_id);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -707,14 +710,14 @@ static void plane_invalid_params(igt_pipe_t *pipe,
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->values[IGT_CRTC_MODE_ID]);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
- /* Valid, but invalid because CRTC_ID is set. */
+ /* Valid, but invalid because CRTC_ID is set */
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, 0);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
igt_plane_set_fb(plane, fb);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Pass a series of invalid object IDs for the CRTC ID. */
+ /* Pass a series of invalid object IDs for the CRTC ID */
igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, plane->drm_plane->plane_id);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -727,14 +730,14 @@ static void plane_invalid_params(igt_pipe_t *pipe,
igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->values[IGT_CRTC_MODE_ID]);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
- /* Valid, but invalid because FB_ID is set. */
+ /* Valid, but invalid because FB_ID is set */
igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, 0);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
igt_plane_set_fb(plane, fb);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Create a framebuffer too small for the plane configuration. */
+ /* Create a framebuffer too small for the plane configuration */
igt_create_pattern_fb(pipe->display->drm_fd,
fb->width - 1, fb->height - 1,
fb->drm_format, I915_TILING_NONE, &fb2);
@@ -742,7 +745,7 @@ static void plane_invalid_params(igt_pipe_t *pipe,
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, fb2.fb_id);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, ENOSPC);
- /* Restore the primary plane and check the state matches the old. */
+ /* Restore the primary plane and check the state matches the old */
igt_plane_set_fb(plane, fb);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
@@ -757,7 +760,7 @@ static void plane_invalid_params_fence(igt_pipe_t *pipe,
timeline = sw_sync_timeline_create();
- /* invalid fence fd */
+ /* Invalid fence fd */
igt_plane_set_fence_fd(plane, pipe->display->drm_fd);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -784,7 +787,7 @@ static void crtc_invalid_params(igt_pipe_t *pipe,
uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
drmModeModeInfo *mode = igt_output_get_mode(output);
- /* Pass a series of invalid object IDs for the mode ID. */
+ /* Pass a series of invalid object IDs for the mode ID */
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, plane->drm_plane->plane_id);
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -810,7 +813,7 @@ static void crtc_invalid_params(igt_pipe_t *pipe,
DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* Create a blob which is the wrong size to be a valid mode. */
+ /* Create a blob which is the wrong size to be a valid mode */
igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) - 1);
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -818,7 +821,7 @@ static void crtc_invalid_params(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
- /* Restore the CRTC and check the state matches the old. */
+ /* Restore the CRTC and check the state matches the old */
igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode));
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
@@ -837,7 +840,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
timeline = sw_sync_timeline_create();
- /* invalid out_fence_ptr */
+ /* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
@@ -845,7 +848,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
- /* invalid out_fence_ptr */
+ /* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
@@ -853,7 +856,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
- /* invalid out_fence_ptr */
+ /* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
@@ -861,7 +864,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
- /* valid in fence but not allowed prop on crtc */
+ /* Valid in fence but not allowed prop on crtc */
fence_fd = sw_sync_timeline_create_fence(timeline, 1);
igt_plane_set_fence_fd(plane, fence_fd);
@@ -870,12 +873,12 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_flags_err(pipe, plane, 0, ATOMIC_RELAX_NONE, EINVAL);
- /* valid out fence ptr and flip event but not allowed prop on crtc */
+ /* Valid out fence ptr and flip event but not allowed prop on crtc */
igt_pipe_request_out_fence(pipe);
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* valid flip event but not allowed prop on crtc */
+ /* Valid flip event but not allowed prop on crtc */
igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
@@ -889,20 +892,20 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
/* Set invalid prop */
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, fb->fb_id);
- /* valid out fence but invalid prop on crtc */
+ /* Valid out fence but invalid prop on crtc */
igt_pipe_request_out_fence(pipe);
crtc_commit_atomic_flags_err(pipe, plane, 0,
ATOMIC_RELAX_NONE, EINVAL);
- /* valid out fence ptr and flip event but invalid prop on crtc */
+ /* Valid out fence ptr and flip event but invalid prop on crtc */
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* valid page flip event but invalid prop on crtc */
+ /* Valid page flip event but invalid prop on crtc */
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* successful TEST_ONLY with fences set */
+ /* Successful TEST_ONLY with fences set */
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, old_mode_id);
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY,
ATOMIC_RELAX_NONE, 0);
@@ -910,21 +913,19 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
close(fence_fd);
close(timeline);
- /* reset fences */
+ /* Reset fences */
igt_plane_set_fence_fd(plane, -1);
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, 0);
igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* out fence ptr but not page flip event */
+ /* Out fence ptr but not page flip event */
igt_pipe_request_out_fence(pipe);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
igt_assert(pipe->out_fence_fd != -1);
}
-/* Abuse the atomic ioctl directly in order to test various invalid conditions,
- * which the libdrm wrapper won't allow us to create. */
static void atomic_invalid_params(igt_pipe_t *pipe,
igt_plane_t *plane,
igt_output_t *output,
@@ -932,15 +933,15 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
{
igt_display_t *display = pipe->display;
struct drm_mode_atomic ioc;
- uint32_t obj_raw[16]; /* array of objects (sized by count_objs) */
- uint32_t num_props_raw[16]; /* array of num props per obj (ditto) */
- uint32_t props_raw[256]; /* array of props (sum of count_props) */
- uint64_t values_raw[256]; /* array of values for properties (ditto) */
+ uint32_t obj_raw[16]; /* Array of objects (sized by count_objs) */
+ uint32_t num_props_raw[16]; /* Array of num props per obj (ditto) */
+ uint32_t props_raw[256]; /* Array of props (sum of count_props) */
+ uint64_t values_raw[256]; /* Array of values for properties (ditto) */
int i;
memset(&ioc, 0, sizeof(ioc));
- /* An empty request should do nothing. */
+ /* An empty request should do nothing */
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
@@ -957,44 +958,44 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
ioc.props_ptr = (uintptr_t) props_raw;
ioc.prop_values_ptr = (uintptr_t) values_raw;
- /* Valid pointers, but still should copy nothing. */
+ /* Valid pointers, but still should copy nothing */
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Valid noop, but with event set should fail. */
+ /* Valid noop, but with event set should fail */
ioc.flags = DRM_MODE_PAGE_FLIP_EVENT;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
- /* Nonsense flags. */
+ /* Nonsense flags */
ioc.flags = 0xdeadbeef;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
ioc.flags = 0;
- /* Safety check that flags is reset properly. */
+ /* Safety check that flags is reset properly */
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Reserved/MBZ. */
+ /* Reserved/MBZ */
ioc.reserved = 1;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
ioc.reserved = 0;
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Zero is not a valid object ID. */
+ /* Zero is not a valid object ID */
ioc.count_objs = ARRAY_SIZE(obj_raw);
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- /* Invalid object type (not a thing we can set properties on). */
+ /* Invalid object type (not a thing we can set properties on) */
ioc.count_objs = 1;
obj_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
obj_raw[0] = fb->fb_id;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- /* Filled object but with no properties; no-op. */
+ /* Filled object but with no properties; no-op */
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
obj_raw[i] = pipe->crtc_id;
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Pass in all sorts of things other than the property ID. */
+ /* Pass in all sorts of things other than the property ID */
num_props_raw[0] = 1;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
props_raw[0] = pipe->crtc_id;
@@ -1006,22 +1007,21 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
props_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- /* Valid property, valid value. */
-
+ /* Valid property, valid value */
for (i = 0; i < ARRAY_SIZE(props_raw); i++) {
props_raw[i] = pipe->props[IGT_CRTC_MODE_ID];
values_raw[i] = pipe->values[IGT_CRTC_MODE_ID];
}
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Setting the same thing multiple times is OK. */
+ /* Setting the same thing multiple times is OK */
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
num_props_raw[i] = ARRAY_SIZE(props_raw) / ARRAY_SIZE(obj_raw);
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
ioc.count_objs = ARRAY_SIZE(obj_raw);
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Pass a series of outlandish addresses. */
+ /* Pass a series of outlandish addresses */
ioc.objs_ptr = 0;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
@@ -1040,7 +1040,7 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
ioc.prop_values_ptr = (uintptr_t) values_raw;
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Attempt to overflow and/or trip various boundary conditions. */
+ /* Attempt to overflow and/or trip various boundary conditions */
ioc.count_objs = UINT32_MAX / sizeof(uint32_t);
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
@@ -1079,10 +1079,10 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
fb->height/2, 1.0, 1.0, 1.0);
igt_put_cairo_ctx(cr_1);
- /*
- * Flip the primary plane to new color fb using atomic API and check the
- * state.
- */
+ /*
+ * Flip the primary plane to new color fb using atomic API and check the
+ * state.
+ */
igt_plane_set_fb(plane, &fb_1);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -1138,7 +1138,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
* NOTE: This will result in no update on plane as damage is outside, so
* will see no change on the screen.
*/
- /* Reszie fb_1 to be bigger than plane */
+ /* Resize fb_1 to be bigger than plane */
igt_remove_fb(pipe->display->drm_fd, &fb_1);
igt_create_color_fb(pipe->display->drm_fd, fb->width * 2, fb->height,
fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
@@ -1263,15 +1263,18 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
igt_remove_fb(pipe->display->drm_fd, &fb_2);
}
-static void atomic_setup(igt_display_t *display, enum pipe pipe, igt_output_t *output, igt_plane_t *primary, struct igt_fb *fb)
+static void atomic_setup(igt_display_t *display, enum pipe pipe, igt_output_t *output,
+ igt_plane_t *primary, struct igt_fb *fb)
{
+ igt_display_reset(display);
igt_output_set_pipe(output, pipe);
igt_plane_set_fb(primary, fb);
crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
-static void atomic_clear(igt_display_t *display, enum pipe pipe, igt_plane_t *primary, igt_output_t *output)
+static void atomic_clear(igt_display_t *display, enum pipe pipe,
+ igt_plane_t *primary, igt_output_t *output)
{
igt_plane_t *plane;
@@ -1284,6 +1287,12 @@ static void atomic_clear(igt_display_t *display, enum pipe pipe, igt_plane_t *pr
crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
+/* Returns true if plane supports zpos property. */
+static bool has_zpos(igt_plane_t *plane)
+{
+ return igt_plane_has_prop(plane, IGT_PLANE_ZPOS);
+}
+
igt_main
{
igt_display_t display;
@@ -1296,9 +1305,7 @@ igt_main
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);
-
kmstest_set_vt_graphics_mode();
-
igt_display_require(&display, display.drm_fd);
igt_require(display.is_atomic);
igt_display_require_output(&display);
@@ -1308,9 +1315,7 @@ igt_main
pipe_obj = &display.pipes[pipe];
primary = igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_PRIMARY);
-
mode = igt_output_get_mode(output);
-
igt_create_pattern_fb(display.drm_fd,
mode->hdisplay, mode->vdisplay,
plane_get_igt_format(primary),
@@ -1323,54 +1328,67 @@ igt_main
igt_plane_t *overlay =
igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
- igt_require(overlay);
+ if (!overlay)
+ continue;
atomic_setup(&display, pipe, output, primary, &fb);
plane_overlay(pipe_obj, output, overlay);
+ atomic_clear(&display, pipe, primary, output);
}
igt_describe("Test for KMS atomic modesetting on primary plane and ensure coherency between "
"the legacy and atomic interfaces.");
igt_subtest("plane-primary-legacy") {
atomic_setup(&display, pipe, output, primary, &fb);
-
plane_primary(pipe_obj, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Verify that the overlay plane can cover the primary one (and "\
+ igt_describe("Test to verify that the overlay plane can cover the primary one (and "\
"vice versa) by changing their zpos property.");
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));
+ if (!overlay)
+ continue;
- igt_require(igt_plane_has_format_mod(primary, format_primary, 0x0));
- igt_require(igt_plane_has_format_mod(overlay, format_overlay, 0x0));
+ if (!has_zpos(primary) || !has_zpos(overlay))
+ continue;
+
+ if (!igt_plane_has_format_mod(primary, DRM_FORMAT_ARGB8888, 0x0) ||
+ !igt_plane_has_format_mod(overlay, DRM_FORMAT_ARGB1555, 0x0))
+ continue;
igt_output_set_pipe(output, pipe);
plane_primary_overlay_mutable_zpos(pipe_obj, output, primary, overlay,
- format_primary, format_overlay);
+ DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB1555);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Verify the reported zpos property of planes by making sure "\
+ igt_describe("Test to verify the reported zpos property of planes by making sure "\
"only higher zpos planes cover the lower zpos ones.");
igt_subtest("plane-immutable-zpos") {
+ int n_planes = pipe_obj->n_planes;
+
+ if (n_planes < 2)
+ continue;
+
igt_output_set_pipe(output, pipe);
- plane_immutable_zpos(&display, pipe_obj, output);
+ plane_immutable_zpos(&display, pipe_obj, output, primary, n_planes);
+ atomic_clear(&display, pipe, primary, output);
}
igt_describe("Test to ensure that DRM_MODE_ATOMIC_TEST_ONLY really only touches "
"the free-standing state objects and nothing else.");
igt_subtest("test-only") {
- atomic_clear(&display, pipe, primary, output);
+ uint32_t format = plane_get_igt_format(primary);
- test_only(pipe_obj, primary, output);
+ if (!format)
+ continue;
+
+ atomic_clear(&display, pipe, primary, output);
+ test_only(pipe_obj, primary, output, format);
}
igt_describe("Test for KMS atomic modesetting on cursor plane and ensure coherency between "
@@ -1379,38 +1397,40 @@ igt_main
igt_plane_t *cursor =
igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_CURSOR);
- igt_require(cursor);
+ if (!cursor)
+ continue;
atomic_setup(&display, pipe, output, primary, &fb);
plane_cursor(pipe_obj, output, cursor);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid plane parameters are passed");
+ igt_describe("Test error handling when invalid plane parameters are passed.");
igt_subtest("plane-invalid-params") {
atomic_setup(&display, pipe, output, primary, &fb);
-
plane_invalid_params(pipe_obj, output, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid plane fence parameters are passed");
+ igt_describe("Test error handling when invalid plane fence parameters are passed.");
igt_subtest("plane-invalid-params-fence") {
atomic_setup(&display, pipe, output, primary, &fb);
-
plane_invalid_params_fence(pipe_obj, output, primary);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid crtc parameters are passed");
+ igt_describe("Test error handling when invalid crtc parameters are passed.");
igt_subtest("crtc-invalid-params") {
atomic_setup(&display, pipe, output, primary, &fb);
-
crtc_invalid_params(pipe_obj, output, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid crtc fence parameters are passed");
+ igt_describe("Test error handling when invalid crtc fence parameters are passed.");
igt_subtest("crtc-invalid-params-fence") {
atomic_setup(&display, pipe, output, primary, &fb);
-
crtc_invalid_params_fence(pipe_obj, output, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
igt_describe("Test abuse the atomic ioctl directly in order to test "
@@ -1418,23 +1438,20 @@ igt_main
"allow us to create.");
igt_subtest("atomic-invalid-params") {
atomic_setup(&display, pipe, output, primary, &fb);
-
atomic_invalid_params(pipe_obj, primary, output, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Simple test cases to use FB_DAMAGE_CLIPS plane property");
- igt_subtest("atomic_plane_damage") {
- igt_require(igt_plane_has_prop(primary, IGT_PLANE_FB_DAMAGE_CLIPS));
-
+ igt_describe("Test case to use FB_DAMAGE_CLIPS plane property.");
+ igt_subtest("atomic-plane-damage") {
+ if (!igt_plane_has_prop(primary, IGT_PLANE_FB_DAMAGE_CLIPS))
+ continue;
atomic_setup(&display, pipe, output, primary, &fb);
-
atomic_plane_damage(pipe_obj, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
igt_fixture {
- atomic_clear(&display, pipe, primary, output);
- igt_remove_fb(display.drm_fd, &fb);
-
igt_display_fini(&display);
close(display.drm_fd);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic
2022-10-13 5:58 [igt-dev] [PATCH i-g-t v2 1/2] tests/kms_atomic: Test cleanup Swati Sharma
@ 2022-10-13 5:58 ` Swati Sharma
2022-10-18 16:15 ` Modem, Bhanuprakash
2022-10-13 6:52 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup Patchwork
2022-10-13 8:10 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Swati Sharma @ 2022-10-13 5:58 UTC (permalink / raw)
To: igt-dev
Subtests are converted to dynamic subtests.
From the fixture for_each_pipe_with_valid_output()
is removed and put at subtest level to give flexibility to
user to test all pipes/output combinations. However,
restricted to 1pipe/1output combination as originally
written in the test. Code rework is done to accommodate
above changes
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
---
tests/kms_atomic.c | 879 ++++++++++++++++++++++++---------------------
1 file changed, 464 insertions(+), 415 deletions(-)
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 535ae2ed7..8c0c4183f 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -52,6 +52,15 @@
IGT_TEST_DESCRIPTION("Test atomic modesetting API.");
+/* Common test data. */
+typedef struct {
+ igt_display_t display;
+ igt_plane_t *primary;
+ igt_pipe_t *pipe;
+ int drm_fd;
+ igt_fb_t fb;
+} data_t;
+
enum kms_atomic_check_relax {
ATOMIC_RELAX_NONE = 0,
CRTC_RELAX_MODE = (1 << 0),
@@ -283,8 +292,8 @@ static uint32_t plane_get_igt_format(igt_plane_t *plane)
}
static void
-plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
- igt_plane_t *primary, igt_plane_t *overlay,
+plane_primary_overlay_mutable_zpos(data_t *data, igt_output_t *output,
+ igt_plane_t *overlay,
uint32_t format_primary, uint32_t format_overlay)
{
struct igt_fb fb_primary, fb_overlay;
@@ -299,17 +308,17 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
uint32_t w_overlay = mode->hdisplay / 2;
uint32_t h_overlay = mode->vdisplay / 2;
- igt_create_color_pattern_fb(pipe->display->drm_fd,
+ igt_create_color_pattern_fb(data->drm_fd,
w, h, format_primary, I915_TILING_NONE,
0.2, 0.2, 0.2, &fb_primary);
- igt_create_color_pattern_fb(pipe->display->drm_fd,
+ igt_create_color_pattern_fb(data->drm_fd,
w_overlay, h_overlay,
format_overlay, I915_TILING_NONE,
0.2, 0.2, 0.2, &fb_overlay);
/* Draw a hole in the overlay */
- cr = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_overlay);
+ cr = igt_get_cairo_ctx(data->drm_fd, &fb_overlay);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
igt_paint_color_alpha(cr, w_overlay / 4, h_overlay / 4,
w_overlay / 2, h_overlay / 2,
@@ -317,33 +326,33 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
igt_put_cairo_ctx(cr);
- igt_plane_set_fb(primary, &fb_primary);
+ igt_plane_set_fb(data->primary, &fb_primary);
igt_plane_set_fb(overlay, &fb_overlay);
igt_plane_set_position(overlay, w_overlay / 2, h_overlay / 2);
- igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 0);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_ZPOS, 0);
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");
- plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 0);
+ igt_assert_eq_u64(igt_plane_get_prop(data->primary, IGT_PLANE_ZPOS), 0);
igt_assert_eq_u64(igt_plane_get_prop(overlay, IGT_PLANE_ZPOS), 1);
- igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 1);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_ZPOS, 1);
igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 0);
igt_info("Committing with primary on top, only the primary "\
"should be visible\n");
- plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 1);
+ igt_assert_eq_u64(igt_plane_get_prop(data->primary, IGT_PLANE_ZPOS), 1);
igt_assert_eq_u64(igt_plane_get_prop(overlay, IGT_PLANE_ZPOS), 0);
/* Draw a hole in the primary exactly on top of the overlay plane */
- cr = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_primary);
+ cr = igt_get_cairo_ctx(data->drm_fd, &fb_primary);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
igt_paint_color_alpha(cr, w_overlay / 2, h_overlay / 2,
w_overlay, h_overlay,
@@ -353,20 +362,19 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
igt_info("Committing with a hole in the primary through "\
"which the underlay should be seen\n");
- plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Reset it back to initial state */
- igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 0);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_ZPOS, 0);
igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 1);
- plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 0);
+ igt_assert_eq_u64(igt_plane_get_prop(data->primary, IGT_PLANE_ZPOS), 0);
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, igt_plane_t *primary, int n_planes)
+plane_immutable_zpos(data_t *data, igt_output_t *output, enum pipe pipe, int n_planes)
{
cairo_t *cr;
struct igt_fb fb_ref;
@@ -380,7 +388,7 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
memset(plane_ptr, 0, n_planes * sizeof(igt_plane_t *));
- igt_require_pipe_crc(display->drm_fd);
+ igt_require_pipe_crc(data->drm_fd);
mode = igt_output_get_mode(output);
/* For lower plane */
@@ -391,36 +399,36 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
w_upper = 64;
h_upper = 64;
- igt_create_color_fb(display->drm_fd,
+ igt_create_color_fb(data->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);
+ cr = igt_get_cairo_ctx(data->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(cr);
- igt_plane_set_fb(primary, &fb_ref);
- igt_display_commit2(display, COMMIT_ATOMIC);
+ igt_plane_set_fb(data->primary, &fb_ref);
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);
/* Create the pipe_crc object for this pipe */
- pipe_crc = igt_pipe_crc_new(pipe->display->drm_fd, pipe->pipe,
+ pipe_crc = igt_pipe_crc_new(data->drm_fd, 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_pipe_crc_get_current(data->drm_fd, pipe_crc, &ref_crc);
- igt_plane_set_fb(primary, NULL);
+ igt_plane_set_fb(data->primary, NULL);
for (int k = 0; k < n_planes; k++) {
int zpos;
igt_plane_t *temp;
- temp = &display->pipes[pipe->pipe].planes[k];
+ temp = &data->display.pipes[pipe].planes[k];
if (!igt_plane_has_prop(temp, IGT_PLANE_ZPOS))
continue;
@@ -431,14 +439,14 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
plane_ptr[zpos] = temp;
}
- fb_id_lower = igt_create_color_fb(display->drm_fd,
+ fb_id_lower = igt_create_color_fb(data->drm_fd,
w_lower, h_lower,
DRM_FORMAT_XRGB8888,
I915_TILING_NONE,
0.0, 0.0, 1.0, &fb_lower);
igt_assert(fb_id_lower);
- fb_id_upper = igt_create_color_fb(display->drm_fd,
+ fb_id_upper = igt_create_color_fb(data->drm_fd,
w_upper, h_upper,
DRM_FORMAT_XRGB8888,
I915_TILING_NONE,
@@ -481,8 +489,8 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
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_display_commit2(&data->display, COMMIT_ATOMIC);
+ igt_pipe_crc_get_current(data->drm_fd, pipe_crc, &new_crc);
igt_assert_crc_equal(&ref_crc, &new_crc);
@@ -490,22 +498,20 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
igt_plane_set_fb(plane_upper, NULL);
}
- igt_remove_fb(display->drm_fd, &fb_ref);
- igt_remove_fb(display->drm_fd, &fb_lower);
- igt_remove_fb(display->drm_fd, &fb_upper);
+ igt_remove_fb(data->drm_fd, &fb_ref);
+ igt_remove_fb(data->drm_fd, &fb_lower);
+ igt_remove_fb(data->drm_fd, &fb_upper);
}
-static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *plane)
+static void plane_overlay(data_t *data, igt_output_t *output, igt_plane_t *plane,
+ uint32_t format)
{
- drmModeModeInfo *mode = igt_output_get_mode(output);
- uint32_t format = plane_get_igt_format(plane);
struct igt_fb fb;
+ drmModeModeInfo *mode = igt_output_get_mode(output);
uint32_t w = mode->hdisplay / 2;
uint32_t h = mode->vdisplay / 2;
- igt_require(format != 0);
-
- igt_create_pattern_fb(pipe->display->drm_fd, w, h,
+ igt_create_pattern_fb(data->drm_fd, w, h,
format, I915_TILING_NONE, &fb);
igt_plane_set_fb(plane, &fb);
@@ -538,106 +544,103 @@ static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *p
igt_plane_set_position(plane, 0, 0);
plane_commit(plane, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
- igt_remove_fb(pipe->display->drm_fd, &fb);
+ igt_remove_fb(data->drm_fd, &fb);
}
-static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *fb)
+static void plane_primary(data_t *data)
{
struct igt_fb fb2;
- igt_create_color_pattern_fb(pipe->display->drm_fd,
- fb->width, fb->height,
- fb->drm_format, I915_TILING_NONE,
+ igt_create_color_pattern_fb(data->drm_fd,
+ data->fb.width, data->fb.height,
+ data->fb.drm_format, I915_TILING_NONE,
0.2, 0.2, 0.2, &fb2);
/*
* Flip the primary plane using the atomic API, and double-check
* state is what we think it should be.
*/
- igt_plane_set_fb(plane, &fb2);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &fb2);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Restore the primary plane and check the state matches the old. */
- igt_plane_set_fb(plane, fb);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &data->fb);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Set the plane through the legacy CRTC/primary-plane API, and
* verify through atomic.
*/
- igt_plane_set_fb(plane, &fb2);
- crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
+ igt_plane_set_fb(data->primary, &fb2);
+ crtc_commit(data->pipe, data->primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
/*
* Restore the plane to its original settings through the legacy CRTC
* API, and verify through atomic.
*/
- igt_plane_set_fb(plane, fb);
- crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
+ igt_plane_set_fb(data->primary, &data->fb);
+ crtc_commit(data->pipe, data->primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
/*
* Set the plane through the universal setplane API, and
* verify through atomic.
*/
- igt_plane_set_fb(plane, &fb2);
- plane_commit(plane, COMMIT_UNIVERSAL, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &fb2);
+ plane_commit(data->primary, COMMIT_UNIVERSAL, ATOMIC_RELAX_NONE);
}
-static void test_only(igt_pipe_t *pipe_obj, igt_plane_t *primary,
- igt_output_t *output, uint32_t format)
+static void test_only(data_t *data, igt_output_t *output, enum pipe pipe, uint32_t format)
{
- drmModeModeInfo *mode = igt_output_get_mode(output);
struct igt_fb fb;
uint64_t old_plane_values[IGT_NUM_PLANE_PROPS], old_crtc_values[IGT_NUM_CRTC_PROPS];
+ drmModeModeInfo *mode = igt_output_get_mode(output);
- plane_get_current_state(primary, old_plane_values);
- crtc_get_current_state(pipe_obj, old_crtc_values);
+ plane_get_current_state(data->primary, old_plane_values);
+ crtc_get_current_state(data->pipe, old_crtc_values);
igt_assert(!old_crtc_values[IGT_CRTC_MODE_ID]);
- igt_create_pattern_fb(pipe_obj->display->drm_fd,
- mode->hdisplay, mode->vdisplay,
- format, I915_TILING_NONE, &fb);
- igt_plane_set_fb(primary, &fb);
- igt_output_set_pipe(output, pipe_obj->pipe);
+ igt_create_pattern_fb(data->drm_fd,
+ mode->hdisplay, mode->vdisplay,
+ format, I915_TILING_NONE, &fb);
+ igt_plane_set_fb(data->primary, &fb);
+ igt_output_set_pipe(output, pipe);
- igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
/* Check the state, should still be old state */
- crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
- plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
+ crtc_check_current_state(data->pipe, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
+ plane_check_current_state(data->primary, old_plane_values, ATOMIC_RELAX_NONE);
/*
* Enable the plane through the legacy CRTC/primary-plane API, and
* verify through atomic.
*/
- crtc_commit(pipe_obj, primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
+ crtc_commit(data->pipe, data->primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
/* Same for disable.. */
- plane_get_current_state(primary, old_plane_values);
- crtc_get_current_state(pipe_obj, old_crtc_values);
+ plane_get_current_state(data->primary, old_plane_values);
+ crtc_get_current_state(data->pipe, old_crtc_values);
- igt_plane_set_fb(primary, NULL);
+ igt_plane_set_fb(data->primary, NULL);
igt_output_set_pipe(output, PIPE_NONE);
- igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
/* For extra stress, go through dpms off/on cycle */
kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_OFF);
kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_ON);
/* Check the state, should still be old state */
- crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
- plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
+ crtc_check_current_state(data->pipe, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
+ plane_check_current_state(data->primary, old_plane_values, ATOMIC_RELAX_NONE);
/* And disable the pipe and remove fb, test complete */
- crtc_commit(pipe_obj, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- igt_remove_fb(pipe_obj->display->drm_fd, &fb);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_remove_fb(data->drm_fd, &fb);
}
-static void plane_cursor(igt_pipe_t *pipe_obj,
- igt_output_t *output,
- igt_plane_t *cursor)
+static void plane_cursor(data_t *data, igt_output_t *output, igt_plane_t *cursor)
{
drmModeModeInfo *mode = igt_output_get_mode(output);
struct igt_fb fb;
@@ -646,12 +649,12 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
int y = mode->vdisplay / 2;
/* Any kernel new enough for atomic, also has the cursor size caps. */
- do_or_die(drmGetCap(pipe_obj->display->drm_fd,
+ do_or_die(drmGetCap(data->drm_fd,
DRM_CAP_CURSOR_WIDTH, &width));
- do_or_die(drmGetCap(pipe_obj->display->drm_fd,
+ do_or_die(drmGetCap(data->drm_fd,
DRM_CAP_CURSOR_HEIGHT, &height));
- igt_create_color_fb(pipe_obj->display->drm_fd,
+ igt_create_color_fb(data->drm_fd,
width, height, DRM_FORMAT_ARGB8888,
DRM_FORMAT_MOD_LINEAR,
0.0, 0.0, 0.0, &fb);
@@ -690,69 +693,64 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
plane_commit(cursor, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
}
-static void plane_invalid_params(igt_pipe_t *pipe,
- igt_output_t *output,
- igt_plane_t *plane,
- struct igt_fb *fb)
+static void plane_invalid_params(data_t *data, igt_output_t *output)
{
struct igt_fb fb2;
/* Pass a series of invalid object IDs for the FB ID */
- igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, plane->drm_plane->plane_id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, data->primary->drm_plane->plane_id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->crtc_id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, data->pipe->crtc_id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, output->id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, output->id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->values[IGT_CRTC_MODE_ID]);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, data->pipe->values[IGT_CRTC_MODE_ID]);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
/* Valid, but invalid because CRTC_ID is set */
- igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, 0);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, 0);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_fb(plane, fb);
- plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &data->fb);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Pass a series of invalid object IDs for the CRTC ID */
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, plane->drm_plane->plane_id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->primary->drm_plane->plane_id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, fb->fb_id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->fb.fb_id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, output->id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, output->id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->values[IGT_CRTC_MODE_ID]);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->pipe->values[IGT_CRTC_MODE_ID]);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
/* Valid, but invalid because FB_ID is set */
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, 0);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, 0);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_plane_set_fb(plane, fb);
- plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &data->fb);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Create a framebuffer too small for the plane configuration */
- igt_create_pattern_fb(pipe->display->drm_fd,
- fb->width - 1, fb->height - 1,
- fb->drm_format, I915_TILING_NONE, &fb2);
+ igt_create_pattern_fb(data->drm_fd,
+ data->fb.width - 1, data->fb.height - 1,
+ data->fb.drm_format, I915_TILING_NONE, &fb2);
- igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, fb2.fb_id);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, ENOSPC);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, fb2.fb_id);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, ENOSPC);
/* Restore the primary plane and check the state matches the old */
- igt_plane_set_fb(plane, fb);
- plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &data->fb);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
-static void plane_invalid_params_fence(igt_pipe_t *pipe,
- igt_output_t *output,
- igt_plane_t *plane)
+static void plane_invalid_params_fence(data_t *data, igt_output_t *output)
{
int timeline, fence_fd;
@@ -761,80 +759,73 @@ static void plane_invalid_params_fence(igt_pipe_t *pipe,
timeline = sw_sync_timeline_create();
/* Invalid fence fd */
- igt_plane_set_fence_fd(plane, pipe->display->drm_fd);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_fence_fd(data->primary, data->drm_fd);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
/* Valid fence_fd but invalid CRTC */
fence_fd = sw_sync_timeline_create_fence(timeline, 1);
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, ~0);
- igt_plane_set_fence_fd(plane, fence_fd);
- plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, ~0);
+ igt_plane_set_fence_fd(data->primary, fence_fd);
+ plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
sw_sync_timeline_inc(timeline, 1);
- igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->crtc_id);
- plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->pipe->crtc_id);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
close(fence_fd);
close(timeline);
}
-static void crtc_invalid_params(igt_pipe_t *pipe,
- igt_output_t *output,
- igt_plane_t *plane,
- struct igt_fb *fb)
+static void crtc_invalid_params(data_t *data, igt_output_t *output)
{
- uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
+ uint64_t old_mode_id = data->pipe->values[IGT_CRTC_MODE_ID];
drmModeModeInfo *mode = igt_output_get_mode(output);
/* Pass a series of invalid object IDs for the mode ID */
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, plane->drm_plane->plane_id);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->primary->drm_plane->plane_id);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, pipe->crtc_id);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->pipe->crtc_id);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, output->id);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, output->id);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, fb->fb_id);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->fb.fb_id);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
/* Can we restore mode? */
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, old_mode_id);
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY, ATOMIC_RELAX_NONE, 0);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, old_mode_id);
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_ATOMIC_TEST_ONLY, ATOMIC_RELAX_NONE, 0);
/*
* TEST_ONLY cannot be combined with DRM_MODE_PAGE_FLIP_EVENT,
* but DRM_MODE_PAGE_FLIP_EVENT will always generate EINVAL
* without valid crtc, so test it here.
*/
- crtc_commit_atomic_flags_err(pipe, plane,
+ crtc_commit_atomic_flags_err(data->pipe, data->primary,
DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
/* Create a blob which is the wrong size to be a valid mode */
- igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) - 1);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
-
- igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) + 1);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
+ igt_pipe_obj_replace_prop_blob(data->pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) - 1);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
+ igt_pipe_obj_replace_prop_blob(data->pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) + 1);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
/* Restore the CRTC and check the state matches the old */
- igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode));
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_pipe_obj_replace_prop_blob(data->pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode));
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
-static void crtc_invalid_params_fence(igt_pipe_t *pipe,
- igt_output_t *output,
- igt_plane_t *plane,
- struct igt_fb *fb)
+static void crtc_invalid_params_fence(data_t *data, igt_output_t *output)
{
int timeline, fence_fd;
void *map;
const ptrdiff_t PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
- uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
+ uint64_t old_mode_id = data->pipe->values[IGT_CRTC_MODE_ID];
igt_require_sw_sync();
@@ -844,94 +835,90 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
/* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
/* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
- crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
+ crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
/* Valid in fence but not allowed prop on crtc */
fence_fd = sw_sync_timeline_create_fence(timeline, 1);
- igt_plane_set_fence_fd(plane, fence_fd);
+ igt_plane_set_fence_fd(data->primary, fence_fd);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_ACTIVE, 0);
- igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_ACTIVE, 0);
+ igt_pipe_obj_clear_prop_changed(data->pipe, IGT_CRTC_OUT_FENCE_PTR);
- crtc_commit_atomic_flags_err(pipe, plane, 0, ATOMIC_RELAX_NONE, EINVAL);
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, 0, ATOMIC_RELAX_NONE, EINVAL);
/* Valid out fence ptr and flip event but not allowed prop on crtc */
- igt_pipe_request_out_fence(pipe);
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
+ igt_pipe_request_out_fence(data->pipe);
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
/* Valid flip event but not allowed prop on crtc */
- igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
+ igt_pipe_obj_clear_prop_changed(data->pipe, IGT_CRTC_OUT_FENCE_PTR);
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_ACTIVE, 1);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_ACTIVE, 1);
/* Configuration should be valid again */
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY,
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_ATOMIC_TEST_ONLY,
ATOMIC_RELAX_NONE, 0);
/* Set invalid prop */
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, fb->fb_id);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->fb.fb_id);
/* Valid out fence but invalid prop on crtc */
- igt_pipe_request_out_fence(pipe);
- crtc_commit_atomic_flags_err(pipe, plane, 0,
+ igt_pipe_request_out_fence(data->pipe);
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, 0,
ATOMIC_RELAX_NONE, EINVAL);
/* Valid out fence ptr and flip event but invalid prop on crtc */
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
/* Valid page flip event but invalid prop on crtc */
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
/* Successful TEST_ONLY with fences set */
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, old_mode_id);
- crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY,
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, old_mode_id);
+ crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_ATOMIC_TEST_ONLY,
ATOMIC_RELAX_NONE, 0);
- igt_assert(pipe->out_fence_fd == -1);
+ igt_assert(data->pipe->out_fence_fd == -1);
close(fence_fd);
close(timeline);
/* Reset fences */
- igt_plane_set_fence_fd(plane, -1);
- igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, 0);
- igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fence_fd(data->primary, -1);
+ igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, 0);
+ igt_pipe_obj_clear_prop_changed(data->pipe, IGT_CRTC_OUT_FENCE_PTR);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Out fence ptr but not page flip event */
- igt_pipe_request_out_fence(pipe);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_pipe_request_out_fence(data->pipe);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- igt_assert(pipe->out_fence_fd != -1);
+ igt_assert(data->pipe->out_fence_fd != -1);
}
-static void atomic_invalid_params(igt_pipe_t *pipe,
- igt_plane_t *plane,
- igt_output_t *output,
- struct igt_fb *fb)
+static void atomic_invalid_params(data_t *data, igt_output_t *output)
{
- igt_display_t *display = pipe->display;
struct drm_mode_atomic ioc;
uint32_t obj_raw[16]; /* Array of objects (sized by count_objs) */
uint32_t num_props_raw[16]; /* Array of num props per obj (ditto) */
@@ -942,7 +929,7 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
memset(&ioc, 0, sizeof(ioc));
/* An empty request should do nothing */
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
obj_raw[i] = 0;
@@ -959,132 +946,132 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
ioc.prop_values_ptr = (uintptr_t) values_raw;
/* Valid pointers, but still should copy nothing */
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Valid noop, but with event set should fail */
ioc.flags = DRM_MODE_PAGE_FLIP_EVENT;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
/* Nonsense flags */
ioc.flags = 0xdeadbeef;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
ioc.flags = 0;
/* Safety check that flags is reset properly */
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Reserved/MBZ */
ioc.reserved = 1;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
ioc.reserved = 0;
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Zero is not a valid object ID */
ioc.count_objs = ARRAY_SIZE(obj_raw);
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
/* Invalid object type (not a thing we can set properties on) */
ioc.count_objs = 1;
- obj_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- obj_raw[0] = fb->fb_id;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ obj_raw[0] = data->pipe->values[IGT_CRTC_MODE_ID];
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ obj_raw[0] = data->fb.fb_id;
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
/* Filled object but with no properties; no-op */
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
- obj_raw[i] = pipe->crtc_id;
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ obj_raw[i] = data->pipe->crtc_id;
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Pass in all sorts of things other than the property ID */
num_props_raw[0] = 1;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- props_raw[0] = pipe->crtc_id;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- props_raw[0] = plane->drm_plane->plane_id;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ props_raw[0] = data->pipe->crtc_id;
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ props_raw[0] = data->primary->drm_plane->plane_id;
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
props_raw[0] = output->id;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- props_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ props_raw[0] = data->pipe->values[IGT_CRTC_MODE_ID];
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
/* Valid property, valid value */
for (i = 0; i < ARRAY_SIZE(props_raw); i++) {
- props_raw[i] = pipe->props[IGT_CRTC_MODE_ID];
- values_raw[i] = pipe->values[IGT_CRTC_MODE_ID];
+ props_raw[i] = data->pipe->props[IGT_CRTC_MODE_ID];
+ values_raw[i] = data->pipe->values[IGT_CRTC_MODE_ID];
}
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Setting the same thing multiple times is OK */
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
num_props_raw[i] = ARRAY_SIZE(props_raw) / ARRAY_SIZE(obj_raw);
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
ioc.count_objs = ARRAY_SIZE(obj_raw);
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Pass a series of outlandish addresses */
ioc.objs_ptr = 0;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
ioc.objs_ptr = (uintptr_t) obj_raw;
ioc.count_props_ptr = 0;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
ioc.count_props_ptr = (uintptr_t) num_props_raw;
ioc.props_ptr = 0;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
ioc.props_ptr = (uintptr_t) props_raw;
ioc.prop_values_ptr = 0;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
ioc.prop_values_ptr = (uintptr_t) values_raw;
- do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
+ do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
/* Attempt to overflow and/or trip various boundary conditions */
ioc.count_objs = UINT32_MAX / sizeof(uint32_t);
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
ioc.count_objs = ARRAY_SIZE(obj_raw);
ioc.objs_ptr = UINT64_MAX - sizeof(uint32_t);
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
ioc.count_objs = 1;
ioc.objs_ptr = UINT64_MAX - sizeof(uint32_t);
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
num_props_raw[0] = UINT32_MAX / sizeof(uint32_t);
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
num_props_raw[0] = UINT32_MAX - 1;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
num_props_raw[i] = (UINT32_MAX / ARRAY_SIZE(obj_raw)) + 1;
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
num_props_raw[i] = ARRAY_SIZE(props_raw) / ARRAY_SIZE(obj_raw);
- do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
+ do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
}
-static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *fb)
+static void atomic_plane_damage(data_t *data)
{
struct drm_mode_rect damage[2];
struct igt_fb fb_1, fb_2;
cairo_t *cr_1, *cr_2;
/* Color fb with white rect at center */
- igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
- fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
+ igt_create_color_fb(data->drm_fd, data->fb.width, data->fb.height,
+ data->fb.drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
&fb_1);
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
- igt_paint_color(cr_1, fb->width/4, fb->height/4, fb->width/2,
- fb->height/2, 1.0, 1.0, 1.0);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
+ igt_paint_color(cr_1, data->fb.width/4, data->fb.height/4, data->fb.width/2,
+ data->fb.height/2, 1.0, 1.0, 1.0);
igt_put_cairo_ctx(cr_1);
/*
* Flip the primary plane to new color fb using atomic API and check the
* state.
*/
- igt_plane_set_fb(plane, &fb_1);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &fb_1);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Change the color of top left clip from center and issue plane update
@@ -1092,35 +1079,35 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
*/
damage[0].x1 = 0;
damage[0].y1 = 0;
- damage[0].x2 = fb->width/2;
- damage[0].y2 = fb->height/2;
+ damage[0].x2 = data->fb.width/2;
+ damage[0].y2 = data->fb.height/2;
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
damage_rect_width(&damage[0]),
damage_rect_height(&damage[0]), 1.0, 0, 0);
igt_put_cairo_ctx(cr_1);
- igt_plane_set_fb(plane, &fb_1);
- igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
+ igt_plane_set_fb(data->primary, &fb_1);
+ igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
sizeof(*damage));
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Change the color of top left and bottom right clip from center and
* issue plane update with damage and verify the state.
*/
- igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
- fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
+ igt_create_color_fb(data->drm_fd, data->fb.width, data->fb.height,
+ data->fb.drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
&fb_2);
- damage[0].x1 = fb->width/2;
+ damage[0].x1 = data->fb.width/2;
damage[0].y1 = 0;
- damage[0].x2 = fb->width;
- damage[0].y2 = fb->height/2;
+ damage[0].x2 = data->fb.width;
+ damage[0].y2 = data->fb.height/2;
- cr_2 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_2);
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
+ cr_2 = igt_get_cairo_ctx(data->drm_fd, &fb_2);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
cairo_set_source_surface(cr_2, fb_1.cairo_surface, 0, 0);
cairo_paint(cr_2);
igt_paint_color(cr_2, damage[0].x1, damage[0].y1,
@@ -1128,10 +1115,10 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
damage_rect_height(&damage[0]), 0, 1.0, 0);
igt_put_cairo_ctx(cr_1);
igt_put_cairo_ctx(cr_2);
- igt_plane_set_fb(plane, &fb_2);
- igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
+ igt_plane_set_fb(data->primary, &fb_2);
+ igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
sizeof(*damage));
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Issue plane update with damage with a clip outside of plane src.
@@ -1139,18 +1126,18 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
* will see no change on the screen.
*/
/* Resize fb_1 to be bigger than plane */
- igt_remove_fb(pipe->display->drm_fd, &fb_1);
- igt_create_color_fb(pipe->display->drm_fd, fb->width * 2, fb->height,
- fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
+ igt_remove_fb(data->drm_fd, &fb_1);
+ igt_create_color_fb(data->drm_fd, data->fb.width * 2, data->fb.height,
+ data->fb.drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
&fb_1);
- damage[0].x1 = fb->width;
+ damage[0].x1 = data->fb.width;
damage[0].y1 = 0;
- damage[0].x2 = fb->width + fb->width/2;
- damage[0].y2 = fb->height/2;
+ damage[0].x2 = data->fb.width + data->fb.width/2;
+ damage[0].y2 = data->fb.height/2;
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
- cr_2 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_2);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
+ cr_2 = igt_get_cairo_ctx(data->drm_fd, &fb_2);
cairo_set_source_surface(cr_1, fb_2.cairo_surface, 0, 0);
cairo_paint(cr_1);
igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
@@ -1158,13 +1145,13 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
damage_rect_height(&damage[0]), 0, 1.0, 0);
igt_put_cairo_ctx(cr_2);
igt_put_cairo_ctx(cr_1);
- igt_plane_set_fb(plane, &fb_1);
- igt_plane_set_size(plane, fb->width, fb->height);
- igt_fb_set_position(&fb_1, plane, 0, 0);
- igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
- igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
+ igt_plane_set_fb(data->primary, &fb_1);
+ igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
+ igt_fb_set_position(&fb_1, data->primary, 0, 0);
+ igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
+ igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
sizeof(*damage));
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Issue a plane update with damage with a clip that overlap with plane
@@ -1172,23 +1159,23 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
* NOTE: Here drm core should take care of intersecting the clip to
* plane src.
*/
- damage[0].x1 = fb->width/2;
+ damage[0].x1 = data->fb.width/2;
damage[0].y1 = 0;
- damage[0].x2 = fb->width/2 + fb->width;
- damage[0].y2 = fb->height/2;
+ damage[0].x2 = data->fb.width/2 + data->fb.width;
+ damage[0].y2 = data->fb.height/2;
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
damage_rect_width(&damage[0]),
damage_rect_height(&damage[0]), 1.0, 1.0, 0);
igt_put_cairo_ctx(cr_1);
- igt_plane_set_fb(plane, &fb_1);
- igt_plane_set_size(plane, fb->width, fb->height);
- igt_fb_set_position(&fb_1, plane, 0, 0);
- igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
- igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
+ igt_plane_set_fb(data->primary, &fb_1);
+ igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
+ igt_fb_set_position(&fb_1, data->primary, 0, 0);
+ igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
+ igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
sizeof(*damage));
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Issue a plane update with damage with two clips one inside plane src
@@ -1196,16 +1183,16 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
* NOTE: This will result in plane update with clip inside plane src.
*/
damage[0].x1 = 0;
- damage[0].y1 = fb->height/2;
- damage[0].x2 = fb->width/2;
- damage[0].y2 = fb->height;
+ damage[0].y1 = data->fb.height/2;
+ damage[0].x2 = data->fb.width/2;
+ damage[0].y2 = data->fb.height;
- damage[1].x1 = fb->width + fb->width/2;
- damage[1].y1 = fb->height/2;
- damage[1].x2 = fb->width * 2;
- damage[1].y2 = fb->height;
+ damage[1].x1 = data->fb.width + data->fb.width/2;
+ damage[1].y1 = data->fb.height/2;
+ damage[1].x2 = data->fb.width * 2;
+ damage[1].y2 = data->fb.height;
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
damage_rect_width(&damage[0]),
damage_rect_height(&damage[0]), 0, 1.0, 1.0);
@@ -1213,13 +1200,13 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
damage_rect_width(&damage[1]),
damage_rect_height(&damage[1]), 0, 1.0, 0);
igt_put_cairo_ctx(cr_1);
- igt_plane_set_fb(plane, &fb_1);
- igt_plane_set_size(plane, fb->width, fb->height);
- igt_fb_set_position(&fb_1, plane, 0, 0);
- igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
- igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
+ igt_plane_set_fb(data->primary, &fb_1);
+ igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
+ igt_fb_set_position(&fb_1, data->primary, 0, 0);
+ igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
+ igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
sizeof(*damage) * 2);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/*
* Issue a plane update with overlapping damage clips. White rect in
@@ -1230,15 +1217,15 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
*/
damage[0].x1 = 0;
damage[0].y1 = 0;
- damage[0].x2 = fb->width/2;
- damage[0].y2 = fb->height/2;
+ damage[0].x2 = data->fb.width/2;
+ damage[0].y2 = data->fb.height/2;
- damage[1].x1 = fb->width/4;
- damage[1].y1 = fb->height/4;
- damage[1].x2 = fb->width/4 + fb->width/2;
- damage[1].y2 = fb->height/4 + fb->height/2;
+ damage[1].x1 = data->fb.width/4;
+ damage[1].y1 = data->fb.height/4;
+ damage[1].x2 = data->fb.width/4 + data->fb.width/2;
+ damage[1].y2 = data->fb.height/4 + data->fb.height/2;
- cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
+ cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
damage_rect_width(&damage[0]),
damage_rect_height(&damage[0]), 1.0, 0, 0);
@@ -1246,45 +1233,55 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
damage_rect_width(&damage[1]),
damage_rect_height(&damage[1]), 1.0, 1.0, 1.0);
igt_put_cairo_ctx(cr_1);
- igt_plane_set_fb(plane, &fb_1);
- igt_plane_set_size(plane, fb->width, fb->height);
- igt_fb_set_position(&fb_1, plane, 0, 0);
- igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
- igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
+ igt_plane_set_fb(data->primary, &fb_1);
+ igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
+ igt_fb_set_position(&fb_1, data->primary, 0, 0);
+ igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
+ igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
sizeof(*damage) * 2);
- crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Restore the primary plane */
- igt_plane_set_fb(plane, fb);
- plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_plane_set_fb(data->primary, &data->fb);
+ plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
/* Remove the fb created for this test */
- igt_remove_fb(pipe->display->drm_fd, &fb_1);
- igt_remove_fb(pipe->display->drm_fd, &fb_2);
+ igt_remove_fb(data->drm_fd, &fb_1);
+ igt_remove_fb(data->drm_fd, &fb_2);
}
-static void atomic_setup(igt_display_t *display, enum pipe pipe, igt_output_t *output,
- igt_plane_t *primary, struct igt_fb *fb)
+static void atomic_setup(data_t *data, enum pipe pipe, igt_output_t *output)
{
- igt_display_reset(display);
+ drmModeModeInfo *mode;
+ igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- igt_plane_set_fb(primary, fb);
- crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ data->primary = igt_pipe_get_plane_type(&data->display.pipes[pipe], DRM_PLANE_TYPE_PRIMARY);
+ data->pipe = &data->display.pipes[pipe];
+ mode = igt_output_get_mode(output);
+
+ igt_create_pattern_fb(data->drm_fd,
+ mode->hdisplay, mode->vdisplay,
+ plane_get_igt_format(data->primary),
+ DRM_FORMAT_MOD_LINEAR, &data->fb);
+
+ igt_plane_set_fb(data->primary, &data->fb);
+
+ crtc_commit(data->primary->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
-static void atomic_clear(igt_display_t *display, enum pipe pipe,
- igt_plane_t *primary, igt_output_t *output)
+static void atomic_clear(data_t *data, enum pipe pipe, igt_output_t *output)
{
igt_plane_t *plane;
- for_each_plane_on_pipe(display, pipe, plane) {
+ for_each_plane_on_pipe(&data->display, pipe, plane) {
igt_plane_set_fb(plane, NULL);
igt_plane_set_position(plane, 0, 0);
}
igt_output_set_pipe(output, PIPE_NONE);
- crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ crtc_commit(data->primary->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
+ igt_remove_fb(data->drm_fd, &data->fb);
}
/* Returns true if plane supports zpos property. */
@@ -1295,164 +1292,216 @@ static bool has_zpos(igt_plane_t *plane)
igt_main
{
- igt_display_t display;
enum pipe pipe = PIPE_NONE;
- igt_pipe_t *pipe_obj;
igt_output_t *output = NULL;
- igt_plane_t *primary = NULL;
- drmModeModeInfo *mode;
- struct igt_fb fb;
+ data_t data = { 0 };
igt_fixture {
- display.drm_fd = drm_open_driver_master(DRIVER_ANY);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
- igt_display_require(&display, display.drm_fd);
- igt_require(display.is_atomic);
- igt_display_require_output(&display);
-
- for_each_pipe_with_valid_output(&display, pipe, output)
- break;
-
- pipe_obj = &display.pipes[pipe];
- primary = igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_PRIMARY);
- mode = igt_output_get_mode(output);
- igt_create_pattern_fb(display.drm_fd,
- mode->hdisplay, mode->vdisplay,
- plane_get_igt_format(primary),
- DRM_FORMAT_MOD_LINEAR, &fb);
+ igt_display_require(&data.display, data.drm_fd);
+ igt_require(data.display.is_atomic);
+ igt_display_require_output(&data.display);
}
igt_describe("Test for KMS atomic modesetting on overlay plane and ensure coherency between "
"the legacy and atomic interfaces.");
- igt_subtest("plane-overlay-legacy") {
- igt_plane_t *overlay =
- igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
+ igt_subtest_with_dynamic("plane-overlay-legacy") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_plane_t *overlay =
+ igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_OVERLAY);
+ uint32_t format = plane_get_igt_format(overlay);
- if (!overlay)
- continue;
+ if (!overlay || !format)
+ continue;
- atomic_setup(&display, pipe, output, primary, &fb);
- plane_overlay(pipe_obj, output, overlay);
- atomic_clear(&display, pipe, primary, output);
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ plane_overlay(&data, output, overlay, format);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test for KMS atomic modesetting on primary plane and ensure coherency between "
"the legacy and atomic interfaces.");
- igt_subtest("plane-primary-legacy") {
- atomic_setup(&display, pipe, output, primary, &fb);
- plane_primary(pipe_obj, primary, &fb);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("plane-primary-legacy") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ plane_primary(&data);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test to verify that the overlay plane can cover the primary one (and "\
"vice versa) by changing their zpos property.");
- igt_subtest("plane-primary-overlay-mutable-zpos") {
- igt_plane_t *overlay =
- igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
+ igt_subtest_with_dynamic("plane-primary-overlay-mutable-zpos") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_plane_t *overlay =
+ igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_OVERLAY);
- if (!overlay)
- continue;
+ atomic_setup(&data, pipe, output);
- if (!has_zpos(primary) || !has_zpos(overlay))
- continue;
+ if (!overlay)
+ continue;
- if (!igt_plane_has_format_mod(primary, DRM_FORMAT_ARGB8888, 0x0) ||
- !igt_plane_has_format_mod(overlay, DRM_FORMAT_ARGB1555, 0x0))
- continue;
+ if (!has_zpos(data.primary) || !has_zpos(overlay))
+ continue;
+
+ if (!igt_plane_has_format_mod(data.primary, DRM_FORMAT_ARGB8888, 0x0) ||
+ !igt_plane_has_format_mod(overlay, DRM_FORMAT_ARGB1555, 0x0))
+ continue;
- igt_output_set_pipe(output, pipe);
- plane_primary_overlay_mutable_zpos(pipe_obj, output, primary, overlay,
- DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB1555);
- atomic_clear(&display, pipe, primary, output);
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ plane_primary_overlay_mutable_zpos(&data, output, overlay,
+ DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB1555);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test to verify the reported zpos property of planes by making sure "\
"only higher zpos planes cover the lower zpos ones.");
- igt_subtest("plane-immutable-zpos") {
- int n_planes = pipe_obj->n_planes;
+ igt_subtest_with_dynamic("plane-immutable-zpos") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ int n_planes = data.display.pipes[pipe].n_planes;
- if (n_planes < 2)
- continue;
+ if (n_planes < 2)
+ continue;
- igt_output_set_pipe(output, pipe);
- plane_immutable_zpos(&display, pipe_obj, output, primary, n_planes);
- atomic_clear(&display, pipe, primary, output);
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ plane_immutable_zpos(&data, output, pipe, n_planes);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test to ensure that DRM_MODE_ATOMIC_TEST_ONLY really only touches "
"the free-standing state objects and nothing else.");
- igt_subtest("test-only") {
- uint32_t format = plane_get_igt_format(primary);
+ igt_subtest_with_dynamic("test-only") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ uint32_t format;
- if (!format)
- continue;
+ atomic_setup(&data, pipe, output);
+ format = plane_get_igt_format(data.primary);
+
+ if (!format)
+ continue;
- atomic_clear(&display, pipe, primary, output);
- test_only(pipe_obj, primary, output, format);
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_clear(&data, pipe, output);
+ test_only(&data, output, pipe, format);
+ }
+ break;
+ }
}
igt_describe("Test for KMS atomic modesetting on cursor plane and ensure coherency between "
"legacy and atomic interfaces.");
- igt_subtest("plane-cursor-legacy") {
- igt_plane_t *cursor =
- igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_CURSOR);
+ igt_subtest_with_dynamic("plane-cursor-legacy") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_plane_t *cursor =
+ igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_CURSOR);
- if (!cursor)
- continue;
+ if (!cursor)
+ continue;
- atomic_setup(&display, pipe, output, primary, &fb);
- plane_cursor(pipe_obj, output, cursor);
- atomic_clear(&display, pipe, primary, output);
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ plane_cursor(&data, output, cursor);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test error handling when invalid plane parameters are passed.");
- igt_subtest("plane-invalid-params") {
- atomic_setup(&display, pipe, output, primary, &fb);
- plane_invalid_params(pipe_obj, output, primary, &fb);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("plane-invalid-params") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ plane_invalid_params(&data, output);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test error handling when invalid plane fence parameters are passed.");
- igt_subtest("plane-invalid-params-fence") {
- atomic_setup(&display, pipe, output, primary, &fb);
- plane_invalid_params_fence(pipe_obj, output, primary);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("plane-invalid-params-fence") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ plane_invalid_params_fence(&data, output);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test error handling when invalid crtc parameters are passed.");
- igt_subtest("crtc-invalid-params") {
- atomic_setup(&display, pipe, output, primary, &fb);
- crtc_invalid_params(pipe_obj, output, primary, &fb);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("crtc-invalid-params") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ crtc_invalid_params(&data, output);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test error handling when invalid crtc fence parameters are passed.");
- igt_subtest("crtc-invalid-params-fence") {
- atomic_setup(&display, pipe, output, primary, &fb);
- crtc_invalid_params_fence(pipe_obj, output, primary, &fb);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("crtc-invalid-params-fence") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ crtc_invalid_params_fence(&data, output);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test abuse the atomic ioctl directly in order to test "
"various invalid conditions which the libdrm wrapper won't "
"allow us to create.");
- igt_subtest("atomic-invalid-params") {
- atomic_setup(&display, pipe, output, primary, &fb);
- atomic_invalid_params(pipe_obj, primary, output, &fb);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("atomic-invalid-params") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_setup(&data, pipe, output);
+ atomic_invalid_params(&data, output);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_describe("Test case to use FB_DAMAGE_CLIPS plane property.");
- igt_subtest("atomic-plane-damage") {
- if (!igt_plane_has_prop(primary, IGT_PLANE_FB_DAMAGE_CLIPS))
- continue;
- atomic_setup(&display, pipe, output, primary, &fb);
- atomic_plane_damage(pipe_obj, primary, &fb);
- atomic_clear(&display, pipe, primary, output);
+ igt_subtest_with_dynamic("atomic-plane-damage") {
+ for_each_pipe_with_valid_output(&data.display, pipe, output) {
+ atomic_setup(&data, pipe, output);
+
+ if (!igt_plane_has_prop(data.primary, IGT_PLANE_FB_DAMAGE_CLIPS))
+ continue;
+
+ igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
+ atomic_plane_damage(&data);
+ atomic_clear(&data, pipe, output);
+ }
+ break;
+ }
}
igt_fixture {
- igt_display_fini(&display);
- close(display.drm_fd);
+ igt_display_fini(&data.display);
+ close(data.drm_fd);
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup
2022-10-13 5:58 [igt-dev] [PATCH i-g-t v2 1/2] tests/kms_atomic: Test cleanup Swati Sharma
2022-10-13 5:58 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic Swati Sharma
@ 2022-10-13 6:52 ` Patchwork
2022-10-13 8:10 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2022-10-13 6:52 UTC (permalink / raw)
To: Swati Sharma; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 8950 bytes --]
== Series Details ==
Series: series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup
URL : https://patchwork.freedesktop.org/series/109648/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12239 -> IGTPW_7956
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with IGTPW_7956 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_7956, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/index.html
Participating hosts (43 -> 42)
------------------------------
Additional (1): fi-icl-u2
Missing (2): fi-ctg-p8600 fi-cfl-guc
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_7956:
### IGT changes ###
#### Warnings ####
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][1] ([i915#4312]) -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-kbl-8809g/igt@runner@aborted.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-kbl-8809g/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@runner@aborted:
- {bat-rpls-1}: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/bat-rpls-1/igt@runner@aborted.html
- {bat-rplp-1}: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/bat-rplp-1/igt@runner@aborted.html
- {fi-tgl-mst}: [FAIL][5] ([i915#4312]) -> [FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-tgl-mst/igt@runner@aborted.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-tgl-mst/igt@runner@aborted.html
Known issues
------------
Here are the changes found in IGTPW_7956 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-icl-u2: NOTRUN -> [SKIP][7] ([i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][8] ([i915#4613]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@gem_lmem_swapping@random-engines.html
* igt@i915_pm_rpm@module-reload:
- fi-cfl-8109u: [PASS][9] -> [DMESG-FAIL][10] ([i915#62])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-cfl-8109u/igt@i915_pm_rpm@module-reload.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-cfl-8109u/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@late_gt_pm:
- fi-cfl-8109u: [PASS][11] -> [DMESG-WARN][12] ([i915#5904]) +30 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-cfl-8109u/igt@i915_selftest@live@late_gt_pm.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-cfl-8109u/igt@i915_selftest@live@late_gt_pm.html
* igt@i915_selftest@live@mman:
- fi-rkl-guc: [PASS][13] -> [INCOMPLETE][14] ([i915#6794])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-rkl-guc/igt@i915_selftest@live@mman.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-rkl-guc/igt@i915_selftest@live@mman.html
* igt@i915_suspend@basic-s2idle-without-i915:
- fi-cfl-8109u: [PASS][15] -> [DMESG-WARN][16] ([i915#5904] / [i915#62])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-cfl-8109u/igt@i915_suspend@basic-s2idle-without-i915.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-cfl-8109u/igt@i915_suspend@basic-s2idle-without-i915.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][17] ([fdo#111827]) +8 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-icl-u2: NOTRUN -> [SKIP][18] ([i915#4103])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-u2: NOTRUN -> [SKIP][19] ([fdo#109285])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_frontbuffer_tracking@basic:
- fi-cfl-8109u: [PASS][20] -> [DMESG-WARN][21] ([i915#62]) +13 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-cfl-8109u/igt@kms_frontbuffer_tracking@basic.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-cfl-8109u/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-icl-u2: NOTRUN -> [SKIP][22] ([i915#3555])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][23] ([fdo#109295] / [i915#3301])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-icl-u2/igt@prime_vgem@basic-userptr.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-adlm-1}: [DMESG-WARN][24] ([i915#2867]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/bat-adlm-1/igt@gem_exec_suspend@basic-s0@smem.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/bat-adlm-1/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-bxt-dsi: [DMESG-FAIL][26] ([i915#5334]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/fi-bxt-dsi/igt@i915_selftest@live@gt_heartbeat.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/fi-bxt-dsi/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@reset:
- {bat-rpls-2}: [DMESG-FAIL][28] ([i915#4983] / [i915#5828]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/bat-rpls-2/igt@i915_selftest@live@reset.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/bat-rpls-2/igt@i915_selftest@live@reset.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5537]: https://gitlab.freedesktop.org/drm/intel/issues/5537
[i915#5828]: https://gitlab.freedesktop.org/drm/intel/issues/5828
[i915#5904]: https://gitlab.freedesktop.org/drm/intel/issues/5904
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6434]: https://gitlab.freedesktop.org/drm/intel/issues/6434
[i915#6471]: https://gitlab.freedesktop.org/drm/intel/issues/6471
[i915#6559]: https://gitlab.freedesktop.org/drm/intel/issues/6559
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#6818]: https://gitlab.freedesktop.org/drm/intel/issues/6818
[i915#7029]: https://gitlab.freedesktop.org/drm/intel/issues/7029
[i915#7031]: https://gitlab.freedesktop.org/drm/intel/issues/7031
[i915#7077]: https://gitlab.freedesktop.org/drm/intel/issues/7077
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7012 -> IGTPW_7956
CI-20190529: 20190529
CI_DRM_12239: c8ba40d43d6d1c9e457ebe91543a04a9e85b29f8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_7956: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/index.html
IGT_7012: ca6f5bdd537d26692c4b1ca011b8c4f227d95703 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Testlist changes
----------------
+igt@kms_atomic@atomic-plane-damage
-igt@kms_atomic@atomic_plane_damage
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/index.html
[-- Attachment #2: Type: text/html, Size: 9698 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup
2022-10-13 5:58 [igt-dev] [PATCH i-g-t v2 1/2] tests/kms_atomic: Test cleanup Swati Sharma
2022-10-13 5:58 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic Swati Sharma
2022-10-13 6:52 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup Patchwork
@ 2022-10-13 8:10 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2022-10-13 8:10 UTC (permalink / raw)
To: Swati Sharma; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 38169 bytes --]
== Series Details ==
Series: series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup
URL : https://patchwork.freedesktop.org/series/109648/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12239_full -> IGTPW_7956_full
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with IGTPW_7956_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_7956_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/index.html
Participating hosts (9 -> 6)
------------------------------
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_7956_full:
### IGT changes ###
#### Possible regressions ####
* {igt@kms_atomic@atomic-plane-damage} (NEW):
- shard-iclb: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb6/igt@kms_atomic@atomic-plane-damage.html
#### Warnings ####
* igt@kms_atomic@plane-primary-overlay-mutable-zpos:
- shard-iclb: [SKIP][2] ([i915#404]) -> [SKIP][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb5/igt@kms_atomic@plane-primary-overlay-mutable-zpos.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb2/igt@kms_atomic@plane-primary-overlay-mutable-zpos.html
- shard-tglb: [SKIP][4] ([i915#404]) -> [SKIP][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-tglb7/igt@kms_atomic@plane-primary-overlay-mutable-zpos.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@kms_atomic@plane-primary-overlay-mutable-zpos.html
New tests
---------
New tests have been introduced between CI_DRM_12239_full and IGTPW_7956_full:
### New IGT tests (41) ###
* igt@kms_atomic@atomic-invalid-params@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.26] s
* igt@kms_atomic@atomic-invalid-params@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.91, 0.97] s
* igt@kms_atomic@atomic-invalid-params@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.49] s
* igt@kms_atomic@atomic-invalid-params@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.16] s
* igt@kms_atomic@atomic-plane-damage:
- Statuses : 4 skip(s)
- Exec time: [0.15, 2.50] s
* igt@kms_atomic@atomic-plane-damage@pipe-a-edp-1:
- Statuses : 1 pass(s)
- Exec time: [0.52] s
* igt@kms_atomic@crtc-invalid-params-fence@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.55] s
* igt@kms_atomic@crtc-invalid-params-fence@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.55, 0.65] s
* igt@kms_atomic@crtc-invalid-params-fence@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.90] s
* igt@kms_atomic@crtc-invalid-params-fence@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.30] s
* igt@kms_atomic@crtc-invalid-params@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.27] s
* igt@kms_atomic@crtc-invalid-params@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.44, 0.47] s
* igt@kms_atomic@crtc-invalid-params@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.51] s
* igt@kms_atomic@crtc-invalid-params@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.10] s
* igt@kms_atomic@plane-cursor-legacy@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.50] s
* igt@kms_atomic@plane-cursor-legacy@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.51, 0.62] s
* igt@kms_atomic@plane-cursor-legacy@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.91] s
* igt@kms_atomic@plane-cursor-legacy@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.30] s
* igt@kms_atomic@plane-immutable-zpos@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.61, 0.90] s
* igt@kms_atomic@plane-immutable-zpos@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.75] s
* igt@kms_atomic@plane-immutable-zpos@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.27] s
* igt@kms_atomic@plane-invalid-params-fence@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.46] s
* igt@kms_atomic@plane-invalid-params-fence@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.50, 0.53] s
* igt@kms_atomic@plane-invalid-params-fence@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.69] s
* igt@kms_atomic@plane-invalid-params-fence@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.32] s
* igt@kms_atomic@plane-invalid-params@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.33] s
* igt@kms_atomic@plane-invalid-params@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.47, 0.49] s
* igt@kms_atomic@plane-invalid-params@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.59] s
* igt@kms_atomic@plane-invalid-params@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.15] s
* igt@kms_atomic@plane-overlay-legacy@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.33] s
* igt@kms_atomic@plane-overlay-legacy@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.46, 0.50] s
* igt@kms_atomic@plane-overlay-legacy@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.56] s
* igt@kms_atomic@plane-overlay-legacy@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.22] s
* igt@kms_atomic@plane-primary-legacy@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.38] s
* igt@kms_atomic@plane-primary-legacy@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [0.53, 0.55] s
* igt@kms_atomic@plane-primary-legacy@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.64] s
* igt@kms_atomic@plane-primary-legacy@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.18] s
* igt@kms_atomic@test-only@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.62] s
* igt@kms_atomic@test-only@pipe-a-edp-1:
- Statuses : 2 pass(s)
- Exec time: [2.63, 2.64] s
* igt@kms_atomic@test-only@pipe-a-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.68] s
* igt@kms_atomic@test-only@pipe-a-vga-1:
- Statuses : 1 pass(s)
- Exec time: [0.27] s
Known issues
------------
Here are the changes found in IGTPW_7956_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_exec@basic-nohangcheck:
- shard-tglb: [PASS][6] -> [FAIL][7] ([i915#6268])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-tglb5/igt@gem_ctx_exec@basic-nohangcheck.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_ctx_persistence@hostile:
- shard-snb: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#1099])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-snb5/igt@gem_ctx_persistence@hostile.html
* igt@gem_ctx_sseu@engines:
- shard-tglb: NOTRUN -> [SKIP][9] ([i915#280])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@gem_ctx_sseu@engines.html
* igt@gem_exec_balancer@parallel-keep-in-fence:
- shard-iclb: [PASS][10] -> [SKIP][11] ([i915#4525]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb2/igt@gem_exec_balancer@parallel-keep-in-fence.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb5/igt@gem_exec_balancer@parallel-keep-in-fence.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-tglb: [PASS][12] -> [FAIL][13] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-tglb5/igt@gem_exec_fair@basic-none-share@rcs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb3/igt@gem_exec_fair@basic-none-share@rcs0.html
- shard-glk: [PASS][14] -> [FAIL][15] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk8/igt@gem_exec_fair@basic-none-share@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk3/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_lmem_swapping@heavy-random:
- shard-glk: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#4613]) +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk5/igt@gem_lmem_swapping@heavy-random.html
* igt@gem_lmem_swapping@parallel-multi:
- shard-tglb: NOTRUN -> [SKIP][17] ([i915#4613]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@gem_lmem_swapping@parallel-multi.html
* igt@gem_lmem_swapping@parallel-random:
- shard-iclb: NOTRUN -> [SKIP][18] ([i915#4613]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb8/igt@gem_lmem_swapping@parallel-random.html
* igt@gem_lmem_swapping@verify-random-ccs:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#4613]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl2/igt@gem_lmem_swapping@verify-random-ccs.html
* igt@gem_pxp@protected-encrypted-src-copy-not-readible:
- shard-tglb: NOTRUN -> [SKIP][20] ([i915#4270]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb5/igt@gem_pxp@protected-encrypted-src-copy-not-readible.html
- shard-iclb: NOTRUN -> [SKIP][21] ([i915#4270]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb1/igt@gem_pxp@protected-encrypted-src-copy-not-readible.html
* igt@gem_render_copy@y-tiled-to-vebox-linear:
- shard-iclb: NOTRUN -> [SKIP][22] ([i915#768])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb1/igt@gem_render_copy@y-tiled-to-vebox-linear.html
* igt@gem_softpin@evict-snoop-interruptible:
- shard-tglb: NOTRUN -> [SKIP][23] ([fdo#109312])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@gem_softpin@evict-snoop-interruptible.html
- shard-iclb: NOTRUN -> [SKIP][24] ([fdo#109312])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb8/igt@gem_softpin@evict-snoop-interruptible.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#3323])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl1/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-tglb: NOTRUN -> [SKIP][26] ([i915#3297])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@gem_userptr_blits@dmabuf-unsync.html
- shard-iclb: NOTRUN -> [SKIP][27] ([i915#3297])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb5/igt@gem_userptr_blits@dmabuf-unsync.html
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: NOTRUN -> [FAIL][28] ([i915#3989] / [i915#454])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb3/igt@i915_pm_dc@dc6-psr.html
* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][29] -> [DMESG-WARN][30] ([i915#180])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl8/igt@i915_suspend@debugfs-reader.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl8/igt@i915_suspend@debugfs-reader.html
* igt@kms_addfb_basic@legacy-format:
- shard-iclb: [PASS][31] -> [INCOMPLETE][32] ([i915#7017] / [i915#7057])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb5/igt@kms_addfb_basic@legacy-format.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_addfb_basic@legacy-format.html
* igt@kms_big_fb@4-tiled-32bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][33] ([i915#5286]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb2/igt@kms_big_fb@4-tiled-32bpp-rotate-90.html
* igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
- shard-iclb: NOTRUN -> [SKIP][34] ([i915#5286]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb6/igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
* igt@kms_big_fb@linear-8bpp-rotate-90:
- shard-iclb: NOTRUN -> [SKIP][35] ([fdo#110725] / [fdo#111614]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_big_fb@linear-8bpp-rotate-90.html
- shard-tglb: NOTRUN -> [SKIP][36] ([fdo#111614]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_big_fb@linear-8bpp-rotate-90.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-tglb: NOTRUN -> [SKIP][37] ([fdo#111615]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-hflip.html
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3886])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl8/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
- shard-glk: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3886]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk5/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
- shard-iclb: NOTRUN -> [SKIP][40] ([fdo#109278] / [i915#3886])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb5/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-yf_tiled_ccs:
- shard-snb: NOTRUN -> [SKIP][41] ([fdo#109271]) +89 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-snb4/igt@kms_ccs@pipe-c-ccs-on-another-bo-yf_tiled_ccs.html
- shard-tglb: NOTRUN -> [SKIP][42] ([fdo#111615] / [i915#3689]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb5/igt@kms_ccs@pipe-c-ccs-on-another-bo-yf_tiled_ccs.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-4_tiled_dg2_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][43] ([i915#6095])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb5/igt@kms_ccs@pipe-c-crc-primary-rotation-180-4_tiled_dg2_mc_ccs.html
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs:
- shard-glk: NOTRUN -> [SKIP][44] ([fdo#109271]) +80 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk7/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs.html
* igt@kms_ccs@pipe-d-bad-pixel-format-4_tiled_dg2_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][45] ([i915#3689]) +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_ccs@pipe-d-bad-pixel-format-4_tiled_dg2_mc_ccs.html
* igt@kms_ccs@pipe-d-crc-sprite-planes-basic-y_tiled_ccs:
- shard-iclb: NOTRUN -> [SKIP][46] ([fdo#109278]) +5 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_ccs@pipe-d-crc-sprite-planes-basic-y_tiled_ccs.html
* igt@kms_chamelium@dp-hpd:
- shard-glk: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827]) +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk7/igt@kms_chamelium@dp-hpd.html
* igt@kms_chamelium@hdmi-edid-change-during-suspend:
- shard-apl: NOTRUN -> [SKIP][48] ([fdo#109271] / [fdo#111827]) +3 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl2/igt@kms_chamelium@hdmi-edid-change-during-suspend.html
* igt@kms_chamelium@vga-hpd-for-each-pipe:
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109284] / [fdo#111827]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_chamelium@vga-hpd-for-each-pipe.html
- shard-snb: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-snb6/igt@kms_chamelium@vga-hpd-for-each-pipe.html
- shard-tglb: NOTRUN -> [SKIP][51] ([fdo#109284] / [fdo#111827]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_chamelium@vga-hpd-for-each-pipe.html
* igt@kms_content_protection@uevent:
- shard-iclb: NOTRUN -> [SKIP][52] ([i915#7118])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_content_protection@uevent.html
- shard-tglb: NOTRUN -> [SKIP][53] ([i915#6944] / [i915#7118])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@kms_content_protection@uevent.html
* igt@kms_content_protection@uevent@pipe-a-dp-1:
- shard-apl: NOTRUN -> [FAIL][54] ([i915#1339] / [i915#7144])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl1/igt@kms_content_protection@uevent@pipe-a-dp-1.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-tglb: NOTRUN -> [SKIP][55] ([fdo#109274] / [fdo#111825])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset-interruptible:
- shard-tglb: NOTRUN -> [SKIP][56] ([fdo#109274] / [fdo#111825] / [i915#3637]) +2 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset-interruptible.html
* igt@kms_flip@2x-flip-vs-panning:
- shard-iclb: NOTRUN -> [SKIP][57] ([fdo#109274]) +3 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb5/igt@kms_flip@2x-flip-vs-panning.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling@pipe-a-valid-mode:
- shard-tglb: NOTRUN -> [SKIP][58] ([i915#2587] / [i915#2672])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][59] ([i915#2672]) +4 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-downscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][60] ([i915#2587] / [i915#2672]) +2 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb7/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-downscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][61] ([i915#3555])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][62] ([i915#2672] / [i915#3555])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling@pipe-a-default-mode.html
* igt@kms_force_connector_basic@force-load-detect:
- shard-tglb: NOTRUN -> [SKIP][63] ([fdo#109285])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_force_connector_basic@force-load-detect.html
- shard-iclb: NOTRUN -> [SKIP][64] ([fdo#109285])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
- shard-tglb: NOTRUN -> [SKIP][65] ([i915#6497]) +3 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-shrfb-draw-mmap-cpu:
- shard-iclb: NOTRUN -> [SKIP][66] ([fdo#109280]) +10 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-shrfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-fullscreen:
- shard-tglb: NOTRUN -> [SKIP][67] ([fdo#109280] / [fdo#111825]) +10 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb5/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-fullscreen.html
* igt@kms_invalid_mode@clock-too-high@edp-1-pipe-c:
- shard-iclb: NOTRUN -> [SKIP][68] ([i915#6403]) +2 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb7/igt@kms_invalid_mode@clock-too-high@edp-1-pipe-c.html
* igt@kms_invalid_mode@clock-too-high@edp-1-pipe-d:
- shard-tglb: NOTRUN -> [SKIP][69] ([i915#6403]) +3 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_invalid_mode@clock-too-high@edp-1-pipe-d.html
* igt@kms_pipe_b_c_ivb@pipe-b-dpms-off-modeset-pipe-c:
- shard-tglb: NOTRUN -> [SKIP][70] ([fdo#109289])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb3/igt@kms_pipe_b_c_ivb@pipe-b-dpms-off-modeset-pipe-c.html
- shard-iclb: NOTRUN -> [SKIP][71] ([fdo#109289])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb1/igt@kms_pipe_b_c_ivb@pipe-b-dpms-off-modeset-pipe-c.html
* igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2:
- shard-glk: NOTRUN -> [FAIL][72] ([i915#4573]) +2 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk3/igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2.html
* igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-5@pipe-a-dp-1:
- shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271]) +91 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl6/igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-5@pipe-a-dp-1.html
* igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-5@pipe-d-edp-1:
- shard-tglb: NOTRUN -> [SKIP][74] ([i915#5176]) +3 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb1/igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-5@pipe-d-edp-1.html
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1:
- shard-iclb: NOTRUN -> [SKIP][75] ([i915#5176]) +4 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb3/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
* igt@kms_prime@basic-modeset-hybrid:
- shard-tglb: NOTRUN -> [SKIP][76] ([i915#6524])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@kms_prime@basic-modeset-hybrid.html
- shard-iclb: NOTRUN -> [SKIP][77] ([i915#6524])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb2/igt@kms_prime@basic-modeset-hybrid.html
* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf:
- shard-tglb: NOTRUN -> [SKIP][78] ([i915#2920])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb2/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html
- shard-glk: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#658])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk7/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html
- shard-iclb: NOTRUN -> [SKIP][80] ([i915#658])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb6/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html
* igt@kms_psr2_sf@cursor-plane-move-continuous-sf:
- shard-apl: NOTRUN -> [SKIP][81] ([fdo#109271] / [i915#658]) +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl8/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][82] -> [SKIP][83] ([fdo#109441])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html
* igt@perf@polling-parameterized:
- shard-apl: [PASS][84] -> [FAIL][85] ([i915#5639])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl7/igt@perf@polling-parameterized.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl7/igt@perf@polling-parameterized.html
#### Possible fixes ####
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][86] ([i915#2846]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk3/igt@gem_exec_fair@basic-deadline.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk2/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][88] ([i915#2842]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl3/igt@gem_exec_fair@basic-none-solo@rcs0.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl6/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-none-vip@rcs0:
- shard-glk: [FAIL][90] ([i915#2842]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk5/igt@gem_exec_fair@basic-none-vip@rcs0.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk5/igt@gem_exec_fair@basic-none-vip@rcs0.html
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][92] ([i915#180] / [i915#1982]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl8/igt@gem_workarounds@suspend-resume-context.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl3/igt@gem_workarounds@suspend-resume-context.html
* igt@i915_pm_dc@dc9-dpms:
- shard-apl: [SKIP][94] ([fdo#109271]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl1/igt@i915_pm_dc@dc9-dpms.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl2/igt@i915_pm_dc@dc9-dpms.html
* igt@i915_suspend@forcewake:
- shard-apl: [DMESG-WARN][96] ([i915#180]) -> [PASS][97] +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl1/igt@i915_suspend@forcewake.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl8/igt@i915_suspend@forcewake.html
* igt@kms_addfb_basic@legacy-format:
- shard-tglb: [INCOMPLETE][98] ([i915#6987]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-tglb2/igt@kms_addfb_basic@legacy-format.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-tglb7/igt@kms_addfb_basic@legacy-format.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [FAIL][100] ([i915#2346]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk1/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][102] ([i915#2122]) -> [PASS][103] +1 similar issue
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk2/igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@ac-hdmi-a1-hdmi-a2.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk7/igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@ac-hdmi-a1-hdmi-a2.html
* igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-valid-mode:
- shard-glk: [FAIL][104] -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk8/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-valid-mode.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk8/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-valid-mode.html
* igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1:
- shard-iclb: [SKIP][106] ([i915#5235]) -> [PASS][107] +2 similar issues
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb2/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb1/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [SKIP][108] ([fdo#109441]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb3/igt@kms_psr@psr2_cursor_plane_move.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
* igt@perf@stress-open-close:
- shard-glk: [INCOMPLETE][110] ([i915#5213]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-glk6/igt@perf@stress-open-close.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-glk1/igt@perf@stress-open-close.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][112] ([i915#658]) -> [SKIP][113] ([i915#588])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb3/igt@i915_pm_dc@dc3co-vpb-simulation.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_content_protection@legacy@pipe-a-dp-1:
- shard-apl: [INCOMPLETE][114] ([i915#1319] / [i915#7121]) -> [INCOMPLETE][115] ([i915#1319] / [i915#7121] / [i915#7173])
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl7/igt@kms_content_protection@legacy@pipe-a-dp-1.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl1/igt@kms_content_protection@legacy@pipe-a-dp-1.html
* igt@kms_content_protection@srm@pipe-a-dp-1:
- shard-apl: [INCOMPLETE][116] ([i915#7121]) -> [INCOMPLETE][117] ([i915#7121] / [i915#7173]) +2 similar issues
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl1/igt@kms_content_protection@srm@pipe-a-dp-1.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl6/igt@kms_content_protection@srm@pipe-a-dp-1.html
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf:
- shard-iclb: [SKIP][118] ([i915#2920]) -> [SKIP][119] ([i915#658]) +1 similar issue
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-iclb2/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-iclb5/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf.html
* igt@runner@aborted:
- shard-apl: ([FAIL][120], [FAIL][121], [FAIL][122], [FAIL][123], [FAIL][124]) ([fdo#109271] / [i915#180] / [i915#3002]) -> ([FAIL][125], [FAIL][126], [FAIL][127]) ([i915#180] / [i915#3002])
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl8/igt@runner@aborted.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl6/igt@runner@aborted.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl1/igt@runner@aborted.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl2/igt@runner@aborted.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12239/shard-apl8/igt@runner@aborted.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl8/igt@runner@aborted.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl3/igt@runner@aborted.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/shard-apl6/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110725]: https://bugs.freedesktop.org/show_bug.cgi?id=110725
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1339]: https://gitlab.freedesktop.org/drm/intel/issues/1339
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5213]: https://gitlab.freedesktop.org/drm/intel/issues/5213
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5639]: https://gitlab.freedesktop.org/drm/intel/issues/5639
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#5939]: https://gitlab.freedesktop.org/drm/intel/issues/5939
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6403]: https://gitlab.freedesktop.org/drm/intel/issues/6403
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6987]: https://gitlab.freedesktop.org/drm/intel/issues/6987
[i915#7017]: https://gitlab.freedesktop.org/drm/intel/issues/7017
[i915#7057]: https://gitlab.freedesktop.org/drm/intel/issues/7057
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7121]: https://gitlab.freedesktop.org/drm/intel/issues/7121
[i915#7144]: https://gitlab.freedesktop.org/drm/intel/issues/7144
[i915#7173]: https://gitlab.freedesktop.org/drm/intel/issues/7173
[i915#768]: https://gitlab.freedesktop.org/drm/intel/issues/768
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7012 -> IGTPW_7956
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12239: c8ba40d43d6d1c9e457ebe91543a04a9e85b29f8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_7956: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/index.html
IGT_7012: ca6f5bdd537d26692c4b1ca011b8c4f227d95703 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7956/index.html
[-- Attachment #2: Type: text/html, Size: 47601 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic
2022-10-13 5:58 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic Swati Sharma
@ 2022-10-18 16:15 ` Modem, Bhanuprakash
0 siblings, 0 replies; 6+ messages in thread
From: Modem, Bhanuprakash @ 2022-10-18 16:15 UTC (permalink / raw)
To: Swati Sharma, igt-dev
On Thu-13-10-2022 11:28 am, Swati Sharma wrote:
> Subtests are converted to dynamic subtests.
> From the fixture for_each_pipe_with_valid_output()
> is removed and put at subtest level to give flexibility to
> user to test all pipes/output combinations. However,
I think, this part is missing in this commit. Maybe we can pass an extra
flag in commandline to run on all pipe/output combinations.
> restricted to 1pipe/1output combination as originally
> written in the test. Code rework is done to accommodate
> above changes
>
> Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
> ---
> tests/kms_atomic.c | 879 ++++++++++++++++++++++++---------------------
> 1 file changed, 464 insertions(+), 415 deletions(-)
>
> diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
> index 535ae2ed7..8c0c4183f 100644
> --- a/tests/kms_atomic.c
> +++ b/tests/kms_atomic.c
> @@ -52,6 +52,15 @@
>
> IGT_TEST_DESCRIPTION("Test atomic modesetting API.");
>
> +/* Common test data. */
> +typedef struct {
> + igt_display_t display;
> + igt_plane_t *primary;
> + igt_pipe_t *pipe;
> + int drm_fd;
> + igt_fb_t fb;
> +} data_t;
> +
> enum kms_atomic_check_relax {
> ATOMIC_RELAX_NONE = 0,
> CRTC_RELAX_MODE = (1 << 0),
> @@ -283,8 +292,8 @@ static uint32_t plane_get_igt_format(igt_plane_t *plane)
> }
>
> static void
> -plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
> - igt_plane_t *primary, igt_plane_t *overlay,
> +plane_primary_overlay_mutable_zpos(data_t *data, igt_output_t *output,
> + igt_plane_t *overlay,
> uint32_t format_primary, uint32_t format_overlay)
> {
> struct igt_fb fb_primary, fb_overlay;
> @@ -299,17 +308,17 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
> uint32_t w_overlay = mode->hdisplay / 2;
> uint32_t h_overlay = mode->vdisplay / 2;
>
> - igt_create_color_pattern_fb(pipe->display->drm_fd,
> + igt_create_color_pattern_fb(data->drm_fd,
> w, h, format_primary, I915_TILING_NONE,
> 0.2, 0.2, 0.2, &fb_primary);
>
> - igt_create_color_pattern_fb(pipe->display->drm_fd,
> + igt_create_color_pattern_fb(data->drm_fd,
> w_overlay, h_overlay,
> format_overlay, I915_TILING_NONE,
> 0.2, 0.2, 0.2, &fb_overlay);
>
> /* Draw a hole in the overlay */
> - cr = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_overlay);
> + cr = igt_get_cairo_ctx(data->drm_fd, &fb_overlay);
> cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> igt_paint_color_alpha(cr, w_overlay / 4, h_overlay / 4,
> w_overlay / 2, h_overlay / 2,
> @@ -317,33 +326,33 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
> cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
> igt_put_cairo_ctx(cr);
>
> - igt_plane_set_fb(primary, &fb_primary);
> + igt_plane_set_fb(data->primary, &fb_primary);
> igt_plane_set_fb(overlay, &fb_overlay);
>
> igt_plane_set_position(overlay, w_overlay / 2, h_overlay / 2);
>
> - igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 0);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_ZPOS, 0);
> 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");
> - plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> - igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 0);
> + igt_assert_eq_u64(igt_plane_get_prop(data->primary, IGT_PLANE_ZPOS), 0);
> igt_assert_eq_u64(igt_plane_get_prop(overlay, IGT_PLANE_ZPOS), 1);
>
> - igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 1);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_ZPOS, 1);
> igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 0);
>
> igt_info("Committing with primary on top, only the primary "\
> "should be visible\n");
> - plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> - igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 1);
> + igt_assert_eq_u64(igt_plane_get_prop(data->primary, IGT_PLANE_ZPOS), 1);
> igt_assert_eq_u64(igt_plane_get_prop(overlay, IGT_PLANE_ZPOS), 0);
>
> /* Draw a hole in the primary exactly on top of the overlay plane */
> - cr = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_primary);
> + cr = igt_get_cairo_ctx(data->drm_fd, &fb_primary);
> cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> igt_paint_color_alpha(cr, w_overlay / 2, h_overlay / 2,
> w_overlay, h_overlay,
> @@ -353,20 +362,19 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
>
> igt_info("Committing with a hole in the primary through "\
> "which the underlay should be seen\n");
> - plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Reset it back to initial state */
> - igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 0);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_ZPOS, 0);
> igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 1);
> - plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> - igt_assert_eq_u64(igt_plane_get_prop(primary, IGT_PLANE_ZPOS), 0);
> + igt_assert_eq_u64(igt_plane_get_prop(data->primary, IGT_PLANE_ZPOS), 0);
> 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, igt_plane_t *primary, int n_planes)
> +plane_immutable_zpos(data_t *data, igt_output_t *output, enum pipe pipe, int n_planes)
> {
> cairo_t *cr;
> struct igt_fb fb_ref;
> @@ -380,7 +388,7 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
>
> memset(plane_ptr, 0, n_planes * sizeof(igt_plane_t *));
>
> - igt_require_pipe_crc(display->drm_fd);
> + igt_require_pipe_crc(data->drm_fd);
> mode = igt_output_get_mode(output);
>
> /* For lower plane */
> @@ -391,36 +399,36 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
> w_upper = 64;
> h_upper = 64;
>
> - igt_create_color_fb(display->drm_fd,
> + igt_create_color_fb(data->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);
> + cr = igt_get_cairo_ctx(data->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(cr);
> - igt_plane_set_fb(primary, &fb_ref);
> - igt_display_commit2(display, COMMIT_ATOMIC);
> + igt_plane_set_fb(data->primary, &fb_ref);
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
>
> /* Create the pipe_crc object for this pipe */
> - pipe_crc = igt_pipe_crc_new(pipe->display->drm_fd, pipe->pipe,
> + pipe_crc = igt_pipe_crc_new(data->drm_fd, 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_pipe_crc_get_current(data->drm_fd, pipe_crc, &ref_crc);
>
> - igt_plane_set_fb(primary, NULL);
> + igt_plane_set_fb(data->primary, NULL);
>
> for (int k = 0; k < n_planes; k++) {
> int zpos;
> igt_plane_t *temp;
>
> - temp = &display->pipes[pipe->pipe].planes[k];
> + temp = &data->display.pipes[pipe].planes[k];
>
> if (!igt_plane_has_prop(temp, IGT_PLANE_ZPOS))
> continue;
> @@ -431,14 +439,14 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
> plane_ptr[zpos] = temp;
> }
>
> - fb_id_lower = igt_create_color_fb(display->drm_fd,
> + fb_id_lower = igt_create_color_fb(data->drm_fd,
> w_lower, h_lower,
> DRM_FORMAT_XRGB8888,
> I915_TILING_NONE,
> 0.0, 0.0, 1.0, &fb_lower);
> igt_assert(fb_id_lower);
>
> - fb_id_upper = igt_create_color_fb(display->drm_fd,
> + fb_id_upper = igt_create_color_fb(data->drm_fd,
> w_upper, h_upper,
> DRM_FORMAT_XRGB8888,
> I915_TILING_NONE,
> @@ -481,8 +489,8 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
>
> 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_display_commit2(&data->display, COMMIT_ATOMIC);
> + igt_pipe_crc_get_current(data->drm_fd, pipe_crc, &new_crc);
>
> igt_assert_crc_equal(&ref_crc, &new_crc);
>
> @@ -490,22 +498,20 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
> igt_plane_set_fb(plane_upper, NULL);
> }
>
> - igt_remove_fb(display->drm_fd, &fb_ref);
> - igt_remove_fb(display->drm_fd, &fb_lower);
> - igt_remove_fb(display->drm_fd, &fb_upper);
> + igt_remove_fb(data->drm_fd, &fb_ref);
> + igt_remove_fb(data->drm_fd, &fb_lower);
> + igt_remove_fb(data->drm_fd, &fb_upper);
> }
>
> -static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *plane)
> +static void plane_overlay(data_t *data, igt_output_t *output, igt_plane_t *plane,
> + uint32_t format)
> {
> - drmModeModeInfo *mode = igt_output_get_mode(output);
> - uint32_t format = plane_get_igt_format(plane);
> struct igt_fb fb;
> + drmModeModeInfo *mode = igt_output_get_mode(output);
> uint32_t w = mode->hdisplay / 2;
> uint32_t h = mode->vdisplay / 2;
>
> - igt_require(format != 0);
> -
> - igt_create_pattern_fb(pipe->display->drm_fd, w, h,
> + igt_create_pattern_fb(data->drm_fd, w, h,
> format, I915_TILING_NONE, &fb);
>
> igt_plane_set_fb(plane, &fb);
> @@ -538,106 +544,103 @@ static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *p
> igt_plane_set_position(plane, 0, 0);
> plane_commit(plane, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
>
> - igt_remove_fb(pipe->display->drm_fd, &fb);
> + igt_remove_fb(data->drm_fd, &fb);
> }
>
> -static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *fb)
> +static void plane_primary(data_t *data)
> {
> struct igt_fb fb2;
>
> - igt_create_color_pattern_fb(pipe->display->drm_fd,
> - fb->width, fb->height,
> - fb->drm_format, I915_TILING_NONE,
> + igt_create_color_pattern_fb(data->drm_fd,
> + data->fb.width, data->fb.height,
> + data->fb.drm_format, I915_TILING_NONE,
> 0.2, 0.2, 0.2, &fb2);
>
> /*
> * Flip the primary plane using the atomic API, and double-check
> * state is what we think it should be.
> */
> - igt_plane_set_fb(plane, &fb2);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &fb2);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Restore the primary plane and check the state matches the old. */
> - igt_plane_set_fb(plane, fb);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &data->fb);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Set the plane through the legacy CRTC/primary-plane API, and
> * verify through atomic.
> */
> - igt_plane_set_fb(plane, &fb2);
> - crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
> + igt_plane_set_fb(data->primary, &fb2);
> + crtc_commit(data->pipe, data->primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
>
> /*
> * Restore the plane to its original settings through the legacy CRTC
> * API, and verify through atomic.
> */
> - igt_plane_set_fb(plane, fb);
> - crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
> + igt_plane_set_fb(data->primary, &data->fb);
> + crtc_commit(data->pipe, data->primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
>
> /*
> * Set the plane through the universal setplane API, and
> * verify through atomic.
> */
> - igt_plane_set_fb(plane, &fb2);
> - plane_commit(plane, COMMIT_UNIVERSAL, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &fb2);
> + plane_commit(data->primary, COMMIT_UNIVERSAL, ATOMIC_RELAX_NONE);
> }
>
> -static void test_only(igt_pipe_t *pipe_obj, igt_plane_t *primary,
> - igt_output_t *output, uint32_t format)
> +static void test_only(data_t *data, igt_output_t *output, enum pipe pipe, uint32_t format)
> {
> - drmModeModeInfo *mode = igt_output_get_mode(output);
> struct igt_fb fb;
> uint64_t old_plane_values[IGT_NUM_PLANE_PROPS], old_crtc_values[IGT_NUM_CRTC_PROPS];
> + drmModeModeInfo *mode = igt_output_get_mode(output);
>
> - plane_get_current_state(primary, old_plane_values);
> - crtc_get_current_state(pipe_obj, old_crtc_values);
> + plane_get_current_state(data->primary, old_plane_values);
> + crtc_get_current_state(data->pipe, old_crtc_values);
>
> igt_assert(!old_crtc_values[IGT_CRTC_MODE_ID]);
>
> - igt_create_pattern_fb(pipe_obj->display->drm_fd,
> - mode->hdisplay, mode->vdisplay,
> - format, I915_TILING_NONE, &fb);
> - igt_plane_set_fb(primary, &fb);
> - igt_output_set_pipe(output, pipe_obj->pipe);
> + igt_create_pattern_fb(data->drm_fd,
> + mode->hdisplay, mode->vdisplay,
> + format, I915_TILING_NONE, &fb);
> + igt_plane_set_fb(data->primary, &fb);
> + igt_output_set_pipe(output, pipe);
>
> - igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
>
> /* Check the state, should still be old state */
> - crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
> - plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
> + crtc_check_current_state(data->pipe, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
> + plane_check_current_state(data->primary, old_plane_values, ATOMIC_RELAX_NONE);
>
> /*
> * Enable the plane through the legacy CRTC/primary-plane API, and
> * verify through atomic.
> */
> - crtc_commit(pipe_obj, primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
> + crtc_commit(data->pipe, data->primary, COMMIT_LEGACY, CRTC_RELAX_MODE);
>
> /* Same for disable.. */
> - plane_get_current_state(primary, old_plane_values);
> - crtc_get_current_state(pipe_obj, old_crtc_values);
> + plane_get_current_state(data->primary, old_plane_values);
> + crtc_get_current_state(data->pipe, old_crtc_values);
>
> - igt_plane_set_fb(primary, NULL);
> + igt_plane_set_fb(data->primary, NULL);
> igt_output_set_pipe(output, PIPE_NONE);
>
> - igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
>
> /* For extra stress, go through dpms off/on cycle */
> kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_OFF);
> kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_ON);
>
> /* Check the state, should still be old state */
> - crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
> - plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
> + crtc_check_current_state(data->pipe, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
> + plane_check_current_state(data->primary, old_plane_values, ATOMIC_RELAX_NONE);
>
> /* And disable the pipe and remove fb, test complete */
> - crtc_commit(pipe_obj, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> - igt_remove_fb(pipe_obj->display->drm_fd, &fb);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_remove_fb(data->drm_fd, &fb);
> }
>
> -static void plane_cursor(igt_pipe_t *pipe_obj,
> - igt_output_t *output,
> - igt_plane_t *cursor)
> +static void plane_cursor(data_t *data, igt_output_t *output, igt_plane_t *cursor)
> {
> drmModeModeInfo *mode = igt_output_get_mode(output);
> struct igt_fb fb;
> @@ -646,12 +649,12 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
> int y = mode->vdisplay / 2;
>
> /* Any kernel new enough for atomic, also has the cursor size caps. */
> - do_or_die(drmGetCap(pipe_obj->display->drm_fd,
> + do_or_die(drmGetCap(data->drm_fd,
> DRM_CAP_CURSOR_WIDTH, &width));
> - do_or_die(drmGetCap(pipe_obj->display->drm_fd,
> + do_or_die(drmGetCap(data->drm_fd,
> DRM_CAP_CURSOR_HEIGHT, &height));
>
> - igt_create_color_fb(pipe_obj->display->drm_fd,
> + igt_create_color_fb(data->drm_fd,
> width, height, DRM_FORMAT_ARGB8888,
> DRM_FORMAT_MOD_LINEAR,
> 0.0, 0.0, 0.0, &fb);
> @@ -690,69 +693,64 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
> plane_commit(cursor, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
> }
>
> -static void plane_invalid_params(igt_pipe_t *pipe,
> - igt_output_t *output,
> - igt_plane_t *plane,
> - struct igt_fb *fb)
> +static void plane_invalid_params(data_t *data, igt_output_t *output)
> {
> struct igt_fb fb2;
>
> /* Pass a series of invalid object IDs for the FB ID */
> - igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, plane->drm_plane->plane_id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, data->primary->drm_plane->plane_id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->crtc_id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, data->pipe->crtc_id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, output->id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, output->id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->values[IGT_CRTC_MODE_ID]);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, data->pipe->values[IGT_CRTC_MODE_ID]);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid, but invalid because CRTC_ID is set */
> - igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, 0);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, 0);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_fb(plane, fb);
> - plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &data->fb);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Pass a series of invalid object IDs for the CRTC ID */
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, plane->drm_plane->plane_id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->primary->drm_plane->plane_id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, fb->fb_id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->fb.fb_id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, output->id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, output->id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->values[IGT_CRTC_MODE_ID]);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->pipe->values[IGT_CRTC_MODE_ID]);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid, but invalid because FB_ID is set */
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, 0);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, 0);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_plane_set_fb(plane, fb);
> - plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &data->fb);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Create a framebuffer too small for the plane configuration */
> - igt_create_pattern_fb(pipe->display->drm_fd,
> - fb->width - 1, fb->height - 1,
> - fb->drm_format, I915_TILING_NONE, &fb2);
> + igt_create_pattern_fb(data->drm_fd,
> + data->fb.width - 1, data->fb.height - 1,
> + data->fb.drm_format, I915_TILING_NONE, &fb2);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, fb2.fb_id);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, ENOSPC);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_FB_ID, fb2.fb_id);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, ENOSPC);
>
> /* Restore the primary plane and check the state matches the old */
> - igt_plane_set_fb(plane, fb);
> - plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &data->fb);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> }
>
> -static void plane_invalid_params_fence(igt_pipe_t *pipe,
> - igt_output_t *output,
> - igt_plane_t *plane)
> +static void plane_invalid_params_fence(data_t *data, igt_output_t *output)
> {
> int timeline, fence_fd;
>
> @@ -761,80 +759,73 @@ static void plane_invalid_params_fence(igt_pipe_t *pipe,
> timeline = sw_sync_timeline_create();
>
> /* Invalid fence fd */
> - igt_plane_set_fence_fd(plane, pipe->display->drm_fd);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_fence_fd(data->primary, data->drm_fd);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid fence_fd but invalid CRTC */
> fence_fd = sw_sync_timeline_create_fence(timeline, 1);
>
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, ~0);
> - igt_plane_set_fence_fd(plane, fence_fd);
> - plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, ~0);
> + igt_plane_set_fence_fd(data->primary, fence_fd);
> + plane_commit_atomic_err(data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> sw_sync_timeline_inc(timeline, 1);
> - igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->crtc_id);
> - plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_prop_value(data->primary, IGT_PLANE_CRTC_ID, data->pipe->crtc_id);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> close(fence_fd);
> close(timeline);
> }
>
> -static void crtc_invalid_params(igt_pipe_t *pipe,
> - igt_output_t *output,
> - igt_plane_t *plane,
> - struct igt_fb *fb)
> +static void crtc_invalid_params(data_t *data, igt_output_t *output)
> {
> - uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
> + uint64_t old_mode_id = data->pipe->values[IGT_CRTC_MODE_ID];
> drmModeModeInfo *mode = igt_output_get_mode(output);
>
> /* Pass a series of invalid object IDs for the mode ID */
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, plane->drm_plane->plane_id);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->primary->drm_plane->plane_id);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, pipe->crtc_id);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->pipe->crtc_id);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, output->id);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, output->id);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, fb->fb_id);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->fb.fb_id);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> /* Can we restore mode? */
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, old_mode_id);
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY, ATOMIC_RELAX_NONE, 0);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, old_mode_id);
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_ATOMIC_TEST_ONLY, ATOMIC_RELAX_NONE, 0);
>
> /*
> * TEST_ONLY cannot be combined with DRM_MODE_PAGE_FLIP_EVENT,
> * but DRM_MODE_PAGE_FLIP_EVENT will always generate EINVAL
> * without valid crtc, so test it here.
> */
> - crtc_commit_atomic_flags_err(pipe, plane,
> + crtc_commit_atomic_flags_err(data->pipe, data->primary,
> DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_PAGE_FLIP_EVENT,
> ATOMIC_RELAX_NONE, EINVAL);
>
> /* Create a blob which is the wrong size to be a valid mode */
> - igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) - 1);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
> -
> - igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) + 1);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
> + igt_pipe_obj_replace_prop_blob(data->pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) - 1);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> + igt_pipe_obj_replace_prop_blob(data->pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) + 1);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EINVAL);
>
> /* Restore the CRTC and check the state matches the old */
> - igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode));
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_pipe_obj_replace_prop_blob(data->pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode));
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> }
>
> -static void crtc_invalid_params_fence(igt_pipe_t *pipe,
> - igt_output_t *output,
> - igt_plane_t *plane,
> - struct igt_fb *fb)
> +static void crtc_invalid_params_fence(data_t *data, igt_output_t *output)
> {
> int timeline, fence_fd;
> void *map;
> const ptrdiff_t PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
> - uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
> + uint64_t old_mode_id = data->pipe->values[IGT_CRTC_MODE_ID];
>
> igt_require_sw_sync();
>
> @@ -844,94 +835,90 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
> map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
> igt_assert(map != MAP_FAILED);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EFAULT);
> munmap(map, PAGE_SIZE);
>
> /* Invalid out_fence_ptr */
> map = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
> igt_assert(map != MAP_FAILED);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EFAULT);
> munmap(map, PAGE_SIZE);
>
> /* Invalid out_fence_ptr */
> map = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
> igt_assert(map != MAP_FAILED);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
> - crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
> + crtc_commit_atomic_err(data->pipe, data->primary, ATOMIC_RELAX_NONE, EFAULT);
> munmap(map, PAGE_SIZE);
>
> /* Valid in fence but not allowed prop on crtc */
> fence_fd = sw_sync_timeline_create_fence(timeline, 1);
> - igt_plane_set_fence_fd(plane, fence_fd);
> + igt_plane_set_fence_fd(data->primary, fence_fd);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_ACTIVE, 0);
> - igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_ACTIVE, 0);
> + igt_pipe_obj_clear_prop_changed(data->pipe, IGT_CRTC_OUT_FENCE_PTR);
>
> - crtc_commit_atomic_flags_err(pipe, plane, 0, ATOMIC_RELAX_NONE, EINVAL);
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, 0, ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid out fence ptr and flip event but not allowed prop on crtc */
> - igt_pipe_request_out_fence(pipe);
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
> + igt_pipe_request_out_fence(data->pipe);
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
> ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid flip event but not allowed prop on crtc */
> - igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
> + igt_pipe_obj_clear_prop_changed(data->pipe, IGT_CRTC_OUT_FENCE_PTR);
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
> ATOMIC_RELAX_NONE, EINVAL);
>
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_ACTIVE, 1);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_ACTIVE, 1);
>
> /* Configuration should be valid again */
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY,
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_ATOMIC_TEST_ONLY,
> ATOMIC_RELAX_NONE, 0);
>
> /* Set invalid prop */
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, fb->fb_id);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, data->fb.fb_id);
>
> /* Valid out fence but invalid prop on crtc */
> - igt_pipe_request_out_fence(pipe);
> - crtc_commit_atomic_flags_err(pipe, plane, 0,
> + igt_pipe_request_out_fence(data->pipe);
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, 0,
> ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid out fence ptr and flip event but invalid prop on crtc */
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
> ATOMIC_RELAX_NONE, EINVAL);
>
> /* Valid page flip event but invalid prop on crtc */
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_PAGE_FLIP_EVENT,
> ATOMIC_RELAX_NONE, EINVAL);
>
> /* Successful TEST_ONLY with fences set */
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, old_mode_id);
> - crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY,
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_MODE_ID, old_mode_id);
> + crtc_commit_atomic_flags_err(data->pipe, data->primary, DRM_MODE_ATOMIC_TEST_ONLY,
> ATOMIC_RELAX_NONE, 0);
> - igt_assert(pipe->out_fence_fd == -1);
> + igt_assert(data->pipe->out_fence_fd == -1);
> close(fence_fd);
> close(timeline);
>
> /* Reset fences */
> - igt_plane_set_fence_fd(plane, -1);
> - igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, 0);
> - igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fence_fd(data->primary, -1);
> + igt_pipe_obj_set_prop_value(data->pipe, IGT_CRTC_OUT_FENCE_PTR, 0);
> + igt_pipe_obj_clear_prop_changed(data->pipe, IGT_CRTC_OUT_FENCE_PTR);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Out fence ptr but not page flip event */
> - igt_pipe_request_out_fence(pipe);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_pipe_request_out_fence(data->pipe);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> - igt_assert(pipe->out_fence_fd != -1);
> + igt_assert(data->pipe->out_fence_fd != -1);
> }
>
> -static void atomic_invalid_params(igt_pipe_t *pipe,
> - igt_plane_t *plane,
> - igt_output_t *output,
> - struct igt_fb *fb)
> +static void atomic_invalid_params(data_t *data, igt_output_t *output)
> {
> - igt_display_t *display = pipe->display;
> struct drm_mode_atomic ioc;
> uint32_t obj_raw[16]; /* Array of objects (sized by count_objs) */
> uint32_t num_props_raw[16]; /* Array of num props per obj (ditto) */
> @@ -942,7 +929,7 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
> memset(&ioc, 0, sizeof(ioc));
>
> /* An empty request should do nothing */
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
> obj_raw[i] = 0;
> @@ -959,132 +946,132 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
> ioc.prop_values_ptr = (uintptr_t) values_raw;
>
> /* Valid pointers, but still should copy nothing */
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Valid noop, but with event set should fail */
> ioc.flags = DRM_MODE_PAGE_FLIP_EVENT;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
>
> /* Nonsense flags */
> ioc.flags = 0xdeadbeef;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
>
> ioc.flags = 0;
> /* Safety check that flags is reset properly */
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Reserved/MBZ */
> ioc.reserved = 1;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
> ioc.reserved = 0;
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Zero is not a valid object ID */
> ioc.count_objs = ARRAY_SIZE(obj_raw);
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
>
> /* Invalid object type (not a thing we can set properties on) */
> ioc.count_objs = 1;
> - obj_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> - obj_raw[0] = fb->fb_id;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + obj_raw[0] = data->pipe->values[IGT_CRTC_MODE_ID];
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + obj_raw[0] = data->fb.fb_id;
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
>
> /* Filled object but with no properties; no-op */
> for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
> - obj_raw[i] = pipe->crtc_id;
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + obj_raw[i] = data->pipe->crtc_id;
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Pass in all sorts of things other than the property ID */
> num_props_raw[0] = 1;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> - props_raw[0] = pipe->crtc_id;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> - props_raw[0] = plane->drm_plane->plane_id;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + props_raw[0] = data->pipe->crtc_id;
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + props_raw[0] = data->primary->drm_plane->plane_id;
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> props_raw[0] = output->id;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> - props_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + props_raw[0] = data->pipe->values[IGT_CRTC_MODE_ID];
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
>
> /* Valid property, valid value */
> for (i = 0; i < ARRAY_SIZE(props_raw); i++) {
> - props_raw[i] = pipe->props[IGT_CRTC_MODE_ID];
> - values_raw[i] = pipe->values[IGT_CRTC_MODE_ID];
> + props_raw[i] = data->pipe->props[IGT_CRTC_MODE_ID];
> + values_raw[i] = data->pipe->values[IGT_CRTC_MODE_ID];
> }
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Setting the same thing multiple times is OK */
> for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
> num_props_raw[i] = ARRAY_SIZE(props_raw) / ARRAY_SIZE(obj_raw);
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> ioc.count_objs = ARRAY_SIZE(obj_raw);
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Pass a series of outlandish addresses */
> ioc.objs_ptr = 0;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
>
> ioc.objs_ptr = (uintptr_t) obj_raw;
> ioc.count_props_ptr = 0;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
>
> ioc.count_props_ptr = (uintptr_t) num_props_raw;
> ioc.props_ptr = 0;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
>
> ioc.props_ptr = (uintptr_t) props_raw;
> ioc.prop_values_ptr = 0;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
>
> ioc.prop_values_ptr = (uintptr_t) values_raw;
> - do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
> + do_ioctl(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
>
> /* Attempt to overflow and/or trip various boundary conditions */
> ioc.count_objs = UINT32_MAX / sizeof(uint32_t);
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
>
> ioc.count_objs = ARRAY_SIZE(obj_raw);
> ioc.objs_ptr = UINT64_MAX - sizeof(uint32_t);
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> ioc.count_objs = 1;
> ioc.objs_ptr = UINT64_MAX - sizeof(uint32_t);
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
>
> num_props_raw[0] = UINT32_MAX / sizeof(uint32_t);
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> num_props_raw[0] = UINT32_MAX - 1;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
>
> for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
> num_props_raw[i] = (UINT32_MAX / ARRAY_SIZE(obj_raw)) + 1;
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
> num_props_raw[i] = ARRAY_SIZE(props_raw) / ARRAY_SIZE(obj_raw);
> - do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> + do_ioctl_err(data->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
> }
>
> -static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *fb)
> +static void atomic_plane_damage(data_t *data)
> {
> struct drm_mode_rect damage[2];
> struct igt_fb fb_1, fb_2;
> cairo_t *cr_1, *cr_2;
>
> /* Color fb with white rect at center */
> - igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
> - fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> + igt_create_color_fb(data->drm_fd, data->fb.width, data->fb.height,
> + data->fb.drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> &fb_1);
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> - igt_paint_color(cr_1, fb->width/4, fb->height/4, fb->width/2,
> - fb->height/2, 1.0, 1.0, 1.0);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> + igt_paint_color(cr_1, data->fb.width/4, data->fb.height/4, data->fb.width/2,
> + data->fb.height/2, 1.0, 1.0, 1.0);
> igt_put_cairo_ctx(cr_1);
>
> /*
> * Flip the primary plane to new color fb using atomic API and check the
> * state.
> */
> - igt_plane_set_fb(plane, &fb_1);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &fb_1);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Change the color of top left clip from center and issue plane update
> @@ -1092,35 +1079,35 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> */
> damage[0].x1 = 0;
> damage[0].y1 = 0;
> - damage[0].x2 = fb->width/2;
> - damage[0].y2 = fb->height/2;
> + damage[0].x2 = data->fb.width/2;
> + damage[0].y2 = data->fb.height/2;
>
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
> damage_rect_width(&damage[0]),
> damage_rect_height(&damage[0]), 1.0, 0, 0);
> igt_put_cairo_ctx(cr_1);
>
> - igt_plane_set_fb(plane, &fb_1);
> - igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> + igt_plane_set_fb(data->primary, &fb_1);
> + igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> sizeof(*damage));
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Change the color of top left and bottom right clip from center and
> * issue plane update with damage and verify the state.
> */
> - igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
> - fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> + igt_create_color_fb(data->drm_fd, data->fb.width, data->fb.height,
> + data->fb.drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> &fb_2);
>
> - damage[0].x1 = fb->width/2;
> + damage[0].x1 = data->fb.width/2;
> damage[0].y1 = 0;
> - damage[0].x2 = fb->width;
> - damage[0].y2 = fb->height/2;
> + damage[0].x2 = data->fb.width;
> + damage[0].y2 = data->fb.height/2;
>
> - cr_2 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_2);
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> + cr_2 = igt_get_cairo_ctx(data->drm_fd, &fb_2);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> cairo_set_source_surface(cr_2, fb_1.cairo_surface, 0, 0);
> cairo_paint(cr_2);
> igt_paint_color(cr_2, damage[0].x1, damage[0].y1,
> @@ -1128,10 +1115,10 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> damage_rect_height(&damage[0]), 0, 1.0, 0);
> igt_put_cairo_ctx(cr_1);
> igt_put_cairo_ctx(cr_2);
> - igt_plane_set_fb(plane, &fb_2);
> - igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> + igt_plane_set_fb(data->primary, &fb_2);
> + igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> sizeof(*damage));
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Issue plane update with damage with a clip outside of plane src.
> @@ -1139,18 +1126,18 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> * will see no change on the screen.
> */
> /* Resize fb_1 to be bigger than plane */
> - igt_remove_fb(pipe->display->drm_fd, &fb_1);
> - igt_create_color_fb(pipe->display->drm_fd, fb->width * 2, fb->height,
> - fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> + igt_remove_fb(data->drm_fd, &fb_1);
> + igt_create_color_fb(data->drm_fd, data->fb.width * 2, data->fb.height,
> + data->fb.drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> &fb_1);
>
> - damage[0].x1 = fb->width;
> + damage[0].x1 = data->fb.width;
> damage[0].y1 = 0;
> - damage[0].x2 = fb->width + fb->width/2;
> - damage[0].y2 = fb->height/2;
> + damage[0].x2 = data->fb.width + data->fb.width/2;
> + damage[0].y2 = data->fb.height/2;
>
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> - cr_2 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_2);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> + cr_2 = igt_get_cairo_ctx(data->drm_fd, &fb_2);
> cairo_set_source_surface(cr_1, fb_2.cairo_surface, 0, 0);
> cairo_paint(cr_1);
> igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
> @@ -1158,13 +1145,13 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> damage_rect_height(&damage[0]), 0, 1.0, 0);
> igt_put_cairo_ctx(cr_2);
> igt_put_cairo_ctx(cr_1);
> - igt_plane_set_fb(plane, &fb_1);
> - igt_plane_set_size(plane, fb->width, fb->height);
> - igt_fb_set_position(&fb_1, plane, 0, 0);
> - igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
> - igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> + igt_plane_set_fb(data->primary, &fb_1);
> + igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
> + igt_fb_set_position(&fb_1, data->primary, 0, 0);
> + igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
> + igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> sizeof(*damage));
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Issue a plane update with damage with a clip that overlap with plane
> @@ -1172,23 +1159,23 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> * NOTE: Here drm core should take care of intersecting the clip to
> * plane src.
> */
> - damage[0].x1 = fb->width/2;
> + damage[0].x1 = data->fb.width/2;
> damage[0].y1 = 0;
> - damage[0].x2 = fb->width/2 + fb->width;
> - damage[0].y2 = fb->height/2;
> + damage[0].x2 = data->fb.width/2 + data->fb.width;
> + damage[0].y2 = data->fb.height/2;
>
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
> damage_rect_width(&damage[0]),
> damage_rect_height(&damage[0]), 1.0, 1.0, 0);
> igt_put_cairo_ctx(cr_1);
> - igt_plane_set_fb(plane, &fb_1);
> - igt_plane_set_size(plane, fb->width, fb->height);
> - igt_fb_set_position(&fb_1, plane, 0, 0);
> - igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
> - igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> + igt_plane_set_fb(data->primary, &fb_1);
> + igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
> + igt_fb_set_position(&fb_1, data->primary, 0, 0);
> + igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
> + igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> sizeof(*damage));
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Issue a plane update with damage with two clips one inside plane src
> @@ -1196,16 +1183,16 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> * NOTE: This will result in plane update with clip inside plane src.
> */
> damage[0].x1 = 0;
> - damage[0].y1 = fb->height/2;
> - damage[0].x2 = fb->width/2;
> - damage[0].y2 = fb->height;
> + damage[0].y1 = data->fb.height/2;
> + damage[0].x2 = data->fb.width/2;
> + damage[0].y2 = data->fb.height;
>
> - damage[1].x1 = fb->width + fb->width/2;
> - damage[1].y1 = fb->height/2;
> - damage[1].x2 = fb->width * 2;
> - damage[1].y2 = fb->height;
> + damage[1].x1 = data->fb.width + data->fb.width/2;
> + damage[1].y1 = data->fb.height/2;
> + damage[1].x2 = data->fb.width * 2;
> + damage[1].y2 = data->fb.height;
>
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
> damage_rect_width(&damage[0]),
> damage_rect_height(&damage[0]), 0, 1.0, 1.0);
> @@ -1213,13 +1200,13 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> damage_rect_width(&damage[1]),
> damage_rect_height(&damage[1]), 0, 1.0, 0);
> igt_put_cairo_ctx(cr_1);
> - igt_plane_set_fb(plane, &fb_1);
> - igt_plane_set_size(plane, fb->width, fb->height);
> - igt_fb_set_position(&fb_1, plane, 0, 0);
> - igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
> - igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> + igt_plane_set_fb(data->primary, &fb_1);
> + igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
> + igt_fb_set_position(&fb_1, data->primary, 0, 0);
> + igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
> + igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> sizeof(*damage) * 2);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /*
> * Issue a plane update with overlapping damage clips. White rect in
> @@ -1230,15 +1217,15 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> */
> damage[0].x1 = 0;
> damage[0].y1 = 0;
> - damage[0].x2 = fb->width/2;
> - damage[0].y2 = fb->height/2;
> + damage[0].x2 = data->fb.width/2;
> + damage[0].y2 = data->fb.height/2;
>
> - damage[1].x1 = fb->width/4;
> - damage[1].y1 = fb->height/4;
> - damage[1].x2 = fb->width/4 + fb->width/2;
> - damage[1].y2 = fb->height/4 + fb->height/2;
> + damage[1].x1 = data->fb.width/4;
> + damage[1].y1 = data->fb.height/4;
> + damage[1].x2 = data->fb.width/4 + data->fb.width/2;
> + damage[1].y2 = data->fb.height/4 + data->fb.height/2;
>
> - cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
> + cr_1 = igt_get_cairo_ctx(data->drm_fd, &fb_1);
> igt_paint_color(cr_1, damage[0].x1, damage[0].y1,
> damage_rect_width(&damage[0]),
> damage_rect_height(&damage[0]), 1.0, 0, 0);
> @@ -1246,45 +1233,55 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> damage_rect_width(&damage[1]),
> damage_rect_height(&damage[1]), 1.0, 1.0, 1.0);
> igt_put_cairo_ctx(cr_1);
> - igt_plane_set_fb(plane, &fb_1);
> - igt_plane_set_size(plane, fb->width, fb->height);
> - igt_fb_set_position(&fb_1, plane, 0, 0);
> - igt_fb_set_size(&fb_1, plane, fb->width, fb->height);
> - igt_plane_replace_prop_blob(plane, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> + igt_plane_set_fb(data->primary, &fb_1);
> + igt_plane_set_size(data->primary, data->fb.width, data->fb.height);
> + igt_fb_set_position(&fb_1, data->primary, 0, 0);
> + igt_fb_set_size(&fb_1, data->primary, data->fb.width, data->fb.height);
> + igt_plane_replace_prop_blob(data->primary, IGT_PLANE_FB_DAMAGE_CLIPS, damage,
> sizeof(*damage) * 2);
> - crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Restore the primary plane */
> - igt_plane_set_fb(plane, fb);
> - plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_plane_set_fb(data->primary, &data->fb);
> + plane_commit(data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
>
> /* Remove the fb created for this test */
> - igt_remove_fb(pipe->display->drm_fd, &fb_1);
> - igt_remove_fb(pipe->display->drm_fd, &fb_2);
> + igt_remove_fb(data->drm_fd, &fb_1);
> + igt_remove_fb(data->drm_fd, &fb_2);
> }
>
> -static void atomic_setup(igt_display_t *display, enum pipe pipe, igt_output_t *output,
> - igt_plane_t *primary, struct igt_fb *fb)
> +static void atomic_setup(data_t *data, enum pipe pipe, igt_output_t *output)
> {
> - igt_display_reset(display);
> + drmModeModeInfo *mode;
> + igt_display_reset(&data->display);
> igt_output_set_pipe(output, pipe);
> - igt_plane_set_fb(primary, fb);
>
> - crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + data->primary = igt_pipe_get_plane_type(&data->display.pipes[pipe], DRM_PLANE_TYPE_PRIMARY);
> + data->pipe = &data->display.pipes[pipe];
> + mode = igt_output_get_mode(output);
> +
> + igt_create_pattern_fb(data->drm_fd,
> + mode->hdisplay, mode->vdisplay,
> + plane_get_igt_format(data->primary),
> + DRM_FORMAT_MOD_LINEAR, &data->fb);
> +
> + igt_plane_set_fb(data->primary, &data->fb);
> +
> + crtc_commit(data->primary->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> }
>
> -static void atomic_clear(igt_display_t *display, enum pipe pipe,
> - igt_plane_t *primary, igt_output_t *output)
> +static void atomic_clear(data_t *data, enum pipe pipe, igt_output_t *output)
> {
> igt_plane_t *plane;
>
> - for_each_plane_on_pipe(display, pipe, plane) {
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> igt_plane_set_fb(plane, NULL);
> igt_plane_set_position(plane, 0, 0);
> }
>
> igt_output_set_pipe(output, PIPE_NONE);
> - crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + crtc_commit(data->primary->pipe, data->primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
> + igt_remove_fb(data->drm_fd, &data->fb);
> }
>
> /* Returns true if plane supports zpos property. */
> @@ -1295,164 +1292,216 @@ static bool has_zpos(igt_plane_t *plane)
>
> igt_main
> {
> - igt_display_t display;
> enum pipe pipe = PIPE_NONE;
> - igt_pipe_t *pipe_obj;
> igt_output_t *output = NULL;
> - igt_plane_t *primary = NULL;
> - drmModeModeInfo *mode;
> - struct igt_fb fb;
> + data_t data = { 0 };
>
> igt_fixture {
> - display.drm_fd = drm_open_driver_master(DRIVER_ANY);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> kmstest_set_vt_graphics_mode();
> - igt_display_require(&display, display.drm_fd);
> - igt_require(display.is_atomic);
> - igt_display_require_output(&display);
> -
> - for_each_pipe_with_valid_output(&display, pipe, output)
> - break;
> -
> - pipe_obj = &display.pipes[pipe];
> - primary = igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_PRIMARY);
> - mode = igt_output_get_mode(output);
> - igt_create_pattern_fb(display.drm_fd,
> - mode->hdisplay, mode->vdisplay,
> - plane_get_igt_format(primary),
> - DRM_FORMAT_MOD_LINEAR, &fb);
> + igt_display_require(&data.display, data.drm_fd);
> + igt_require(data.display.is_atomic);
> + igt_display_require_output(&data.display);
> }
>
> igt_describe("Test for KMS atomic modesetting on overlay plane and ensure coherency between "
> "the legacy and atomic interfaces.");
> - igt_subtest("plane-overlay-legacy") {
> - igt_plane_t *overlay =
> - igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
> + igt_subtest_with_dynamic("plane-overlay-legacy") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_plane_t *overlay =
> + igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_OVERLAY);
> + uint32_t format = plane_get_igt_format(overlay);
>
> - if (!overlay)
> - continue;
> + if (!overlay || !format)
> + continue;
>
> - atomic_setup(&display, pipe, output, primary, &fb);
> - plane_overlay(pipe_obj, output, overlay);
> - atomic_clear(&display, pipe, primary, output);
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + plane_overlay(&data, output, overlay, format);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test for KMS atomic modesetting on primary plane and ensure coherency between "
> "the legacy and atomic interfaces.");
> - igt_subtest("plane-primary-legacy") {
> - atomic_setup(&display, pipe, output, primary, &fb);
> - plane_primary(pipe_obj, primary, &fb);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("plane-primary-legacy") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + plane_primary(&data);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test to verify that the overlay plane can cover the primary one (and "\
> "vice versa) by changing their zpos property.");
> - igt_subtest("plane-primary-overlay-mutable-zpos") {
> - igt_plane_t *overlay =
> - igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
> + igt_subtest_with_dynamic("plane-primary-overlay-mutable-zpos") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_plane_t *overlay =
> + igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_OVERLAY);
>
> - if (!overlay)
> - continue;
> + atomic_setup(&data, pipe, output);
>
> - if (!has_zpos(primary) || !has_zpos(overlay))
> - continue;
> + if (!overlay)
> + continue;
>
> - if (!igt_plane_has_format_mod(primary, DRM_FORMAT_ARGB8888, 0x0) ||
> - !igt_plane_has_format_mod(overlay, DRM_FORMAT_ARGB1555, 0x0))
> - continue;
> + if (!has_zpos(data.primary) || !has_zpos(overlay))
> + continue;
> +
> + if (!igt_plane_has_format_mod(data.primary, DRM_FORMAT_ARGB8888, 0x0) ||
> + !igt_plane_has_format_mod(overlay, DRM_FORMAT_ARGB1555, 0x0))
> + continue;
>
> - igt_output_set_pipe(output, pipe);
> - plane_primary_overlay_mutable_zpos(pipe_obj, output, primary, overlay,
> - DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB1555);
> - atomic_clear(&display, pipe, primary, output);
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + plane_primary_overlay_mutable_zpos(&data, output, overlay,
> + DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB1555);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test to verify the reported zpos property of planes by making sure "\
> "only higher zpos planes cover the lower zpos ones.");
> - igt_subtest("plane-immutable-zpos") {
> - int n_planes = pipe_obj->n_planes;
> + igt_subtest_with_dynamic("plane-immutable-zpos") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + int n_planes = data.display.pipes[pipe].n_planes;
>
> - if (n_planes < 2)
> - continue;
> + if (n_planes < 2)
> + continue;
>
> - igt_output_set_pipe(output, pipe);
> - plane_immutable_zpos(&display, pipe_obj, output, primary, n_planes);
> - atomic_clear(&display, pipe, primary, output);
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + plane_immutable_zpos(&data, output, pipe, n_planes);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test to ensure that DRM_MODE_ATOMIC_TEST_ONLY really only touches "
> "the free-standing state objects and nothing else.");
> - igt_subtest("test-only") {
> - uint32_t format = plane_get_igt_format(primary);
> + igt_subtest_with_dynamic("test-only") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + uint32_t format;
>
> - if (!format)
> - continue;
> + atomic_setup(&data, pipe, output);
> + format = plane_get_igt_format(data.primary);
> +
> + if (!format)
> + continue;
>
> - atomic_clear(&display, pipe, primary, output);
> - test_only(pipe_obj, primary, output, format);
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_clear(&data, pipe, output);
> + test_only(&data, output, pipe, format);
> + }
> + break;
> + }
> }
>
> igt_describe("Test for KMS atomic modesetting on cursor plane and ensure coherency between "
> "legacy and atomic interfaces.");
> - igt_subtest("plane-cursor-legacy") {
> - igt_plane_t *cursor =
> - igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_CURSOR);
> + igt_subtest_with_dynamic("plane-cursor-legacy") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_plane_t *cursor =
> + igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_CURSOR);
>
> - if (!cursor)
> - continue;
> + if (!cursor)
> + continue;
>
> - atomic_setup(&display, pipe, output, primary, &fb);
> - plane_cursor(pipe_obj, output, cursor);
> - atomic_clear(&display, pipe, primary, output);
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + plane_cursor(&data, output, cursor);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test error handling when invalid plane parameters are passed.");
> - igt_subtest("plane-invalid-params") {
> - atomic_setup(&display, pipe, output, primary, &fb);
> - plane_invalid_params(pipe_obj, output, primary, &fb);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("plane-invalid-params") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + plane_invalid_params(&data, output);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test error handling when invalid plane fence parameters are passed.");
> - igt_subtest("plane-invalid-params-fence") {
> - atomic_setup(&display, pipe, output, primary, &fb);
> - plane_invalid_params_fence(pipe_obj, output, primary);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("plane-invalid-params-fence") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + plane_invalid_params_fence(&data, output);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test error handling when invalid crtc parameters are passed.");
> - igt_subtest("crtc-invalid-params") {
> - atomic_setup(&display, pipe, output, primary, &fb);
> - crtc_invalid_params(pipe_obj, output, primary, &fb);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("crtc-invalid-params") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + crtc_invalid_params(&data, output);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test error handling when invalid crtc fence parameters are passed.");
> - igt_subtest("crtc-invalid-params-fence") {
> - atomic_setup(&display, pipe, output, primary, &fb);
> - crtc_invalid_params_fence(pipe_obj, output, primary, &fb);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("crtc-invalid-params-fence") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + crtc_invalid_params_fence(&data, output);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test abuse the atomic ioctl directly in order to test "
> "various invalid conditions which the libdrm wrapper won't "
> "allow us to create.");
> - igt_subtest("atomic-invalid-params") {
> - atomic_setup(&display, pipe, output, primary, &fb);
> - atomic_invalid_params(pipe_obj, primary, output, &fb);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("atomic-invalid-params") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_setup(&data, pipe, output);
> + atomic_invalid_params(&data, output);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_describe("Test case to use FB_DAMAGE_CLIPS plane property.");
> - igt_subtest("atomic-plane-damage") {
> - if (!igt_plane_has_prop(primary, IGT_PLANE_FB_DAMAGE_CLIPS))
> - continue;
> - atomic_setup(&display, pipe, output, primary, &fb);
> - atomic_plane_damage(pipe_obj, primary, &fb);
> - atomic_clear(&display, pipe, primary, output);
> + igt_subtest_with_dynamic("atomic-plane-damage") {
> + for_each_pipe_with_valid_output(&data.display, pipe, output) {
> + atomic_setup(&data, pipe, output);
> +
> + if (!igt_plane_has_prop(data.primary, IGT_PLANE_FB_DAMAGE_CLIPS))
> + continue;
> +
> + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> + atomic_plane_damage(&data);
> + atomic_clear(&data, pipe, output);
> + }
> + break;
> + }
> }
>
> igt_fixture {
> - igt_display_fini(&display);
> - close(display.drm_fd);
> + igt_display_fini(&data.display);
> + close(data.drm_fd);
> }
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t v2 1/2] tests/kms_atomic: Test cleanup
@ 2022-10-12 17:04 Swati Sharma
0 siblings, 0 replies; 6+ messages in thread
From: Swati Sharma @ 2022-10-12 17:04 UTC (permalink / raw)
To: igt-dev
Removed unnecessary newlines and comments.
Sanitize the system state before starting the subtest.
v2: -As thumb rule, all comments should start from uppercase.
-Corrected multiline comments
v3: -Split patch into 2 patches
-Avoid skips inside test
-Cleanup after subtest executes
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
---
tests/kms_atomic.c | 334 +++++++++++++++++++++++++--------------------
1 file changed, 184 insertions(+), 150 deletions(-)
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 253829f2..b352169d 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -27,10 +27,6 @@
* Pekka Paalanen <pekka.paalanen@collabora.co.uk>
*/
-/*
- * Testcase: testing atomic modesetting API
- */
-
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -54,7 +50,7 @@
#define DRM_CAP_CURSOR_HEIGHT 0x9
#endif
-IGT_TEST_DESCRIPTION("Test atomic modesetting API");
+IGT_TEST_DESCRIPTION("Test atomic modesetting API.");
enum kms_atomic_check_relax {
ATOMIC_RELAX_NONE = 0,
@@ -72,7 +68,6 @@ static inline int damage_rect_height(struct drm_mode_rect *r)
return r->y2 - r->y1;
}
-
static bool plane_filter(enum igt_atomic_plane_properties prop)
{
if ((1 << prop) & IGT_PLANE_COORD_CHANGED_MASK)
@@ -119,8 +114,10 @@ static void plane_check_current_state(igt_plane_t *plane, const uint64_t *values
plane_get_current_state(plane, current_values);
- /* Legacy cursor ioctls create their own, unknowable, internal
- * framebuffer which we can't reason about. */
+ /*
+ * Legacy cursor ioctls create their own, unknowable, internal
+ * framebuffer which we can't reason about.
+ */
if (relax & PLANE_RELAX_FB)
current_values[IGT_PLANE_FB_ID] = values[IGT_PLANE_FB_ID];
@@ -145,9 +142,7 @@ static void plane_commit_atomic_err(igt_plane_t *plane,
uint64_t current_values[IGT_NUM_PLANE_PROPS];
plane_get_current_state(plane, current_values);
-
igt_assert_eq(-err, igt_display_try_commit2(plane->pipe->display, COMMIT_ATOMIC));
-
plane_check_current_state(plane, current_values, relax);
}
@@ -186,7 +181,6 @@ static void crtc_check_current_state(igt_pipe_t *pipe,
if (pipe_values[IGT_CRTC_MODE_ID]) {
mode_prop = drmModeGetPropertyBlob(pipe->display->drm_fd,
pipe_values[IGT_CRTC_MODE_ID]);
-
igt_assert(mode_prop);
igt_assert_eq(mode_prop->length,
@@ -218,15 +212,16 @@ static void crtc_check_current_state(igt_pipe_t *pipe,
crtc_get_current_state(pipe, current_pipe_values);
- /* Optionally relax the check for MODE_ID: using the legacy SetCrtc
+ /*
+ * Optionally relax the check for MODE_ID: using the legacy SetCrtc
* API can potentially change MODE_ID even if the mode itself remains
- * unchanged. */
+ * unchanged.
+ */
if (relax & CRTC_RELAX_MODE && mode && current_pipe_values[IGT_CRTC_MODE_ID] &&
current_pipe_values[IGT_CRTC_MODE_ID] != pipe_values[IGT_CRTC_MODE_ID]) {
drmModePropertyBlobRes *cur_prop =
drmModeGetPropertyBlob(pipe->display->drm_fd,
current_pipe_values[IGT_CRTC_MODE_ID]);
-
igt_assert(cur_prop);
igt_assert_eq(cur_prop->length, sizeof(struct drm_mode_modeinfo));
@@ -296,11 +291,11 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
drmModeModeInfo *mode = igt_output_get_mode(output);
cairo_t *cr;
- /* for primary */
+ /* For primary plane */
uint32_t w = mode->hdisplay;
uint32_t h = mode->vdisplay;
- /* for overlay */
+ /* For overlay plane */
uint32_t w_overlay = mode->hdisplay / 2;
uint32_t h_overlay = mode->vdisplay / 2;
@@ -360,7 +355,7 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
"which the underlay should be seen\n");
plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* reset it back to initial state */
+ /* Reset it back to initial state */
igt_plane_set_prop_value(primary, IGT_PLANE_ZPOS, 0);
igt_plane_set_prop_value(overlay, IGT_PLANE_ZPOS, 1);
plane_commit(primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -371,33 +366,28 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
static void
plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
- igt_output_t *output)
+ igt_output_t *output, igt_plane_t *primary, int n_planes)
{
cairo_t *cr;
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 fb_id_lower, fb_id_upper;
- int n_planes = pipe->n_planes;
igt_plane_t *plane_ptr[n_planes];
struct igt_fb fb_lower, fb_upper;
uint32_t w_lower, h_lower, w_upper, h_upper;
memset(plane_ptr, 0, n_planes * sizeof(igt_plane_t *));
- igt_require(n_planes >= 2);
igt_require_pipe_crc(display->drm_fd);
-
mode = igt_output_get_mode(output);
- primary = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
- /* for lower plane */
+ /* For lower plane */
w_lower = mode->hdisplay;
h_lower = mode->vdisplay;
- /* for upper plane */
+ /* For upper plane */
w_upper = 64;
h_upper = 64;
@@ -407,7 +397,7 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
I915_TILING_NONE,
0.0, 0.0, 0.0, &fb_ref);
- /* create reference image */
+ /* 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);
@@ -416,11 +406,11 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
igt_plane_set_fb(primary, &fb_ref);
igt_display_commit2(display, COMMIT_ATOMIC);
- /* create the pipe_crc object for this pipe */
+ /* 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 */
+ /* Get reference crc */
igt_pipe_crc_start(pipe_crc);
igt_pipe_crc_get_current(display->drm_fd, pipe_crc, &ref_crc);
@@ -456,8 +446,8 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
igt_assert(fb_id_upper);
/*
- * checking only pairs of plane in increasing fashion
- * to avoid combinatorial explosion
+ * Checking only pairs of plane in increasing fashion
+ * to avoid combinatorial explosion.
*/
for (int i = 0; i < n_planes - 1; i++) {
igt_plane_t *plane_lower, *plane_upper;
@@ -521,23 +511,29 @@ static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *p
igt_plane_set_fb(plane, &fb);
igt_plane_set_position(plane, w/2, h/2);
- /* Enable the overlay plane using the atomic API, and double-check
- * state is what we think it should be. */
+ /*
+ * Enable the overlay plane using the atomic API, and double-check
+ * state is what we think it should be.
+ */
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Disable the plane and check the state matches the old. */
+ /* Disable the plane and check the state matches the old */
igt_plane_set_fb(plane, NULL);
igt_plane_set_position(plane, 0, 0);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Re-enable the plane through the legacy plane API, and verify through
- * atomic. */
+ /*
+ * Re-enable the plane through the legacy plane API, and verify through
+ * atomic.
+ */
igt_plane_set_fb(plane, &fb);
igt_plane_set_position(plane, w/2, h/2);
plane_commit(plane, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
- /* Restore the plane to its original settings through the legacy plane
- * API, and verify through atomic. */
+ /*
+ * Restore the plane to its original settings through the legacy plane
+ * API, and verify through atomic.
+ */
igt_plane_set_fb(plane, NULL);
igt_plane_set_position(plane, 0, 0);
plane_commit(plane, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
@@ -554,8 +550,10 @@ static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *f
fb->drm_format, I915_TILING_NONE,
0.2, 0.2, 0.2, &fb2);
- /* Flip the primary plane using the atomic API, and double-check
- * state is what we think it should be. */
+ /*
+ * Flip the primary plane using the atomic API, and double-check
+ * state is what we think it should be.
+ */
igt_plane_set_fb(plane, &fb2);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -563,36 +561,35 @@ static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *f
igt_plane_set_fb(plane, fb);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Set the plane through the legacy CRTC/primary-plane API, and
- * verify through atomic. */
+ /*
+ * Set the plane through the legacy CRTC/primary-plane API, and
+ * verify through atomic.
+ */
igt_plane_set_fb(plane, &fb2);
crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
- /* Restore the plane to its original settings through the legacy CRTC
- * API, and verify through atomic. */
+ /*
+ * Restore the plane to its original settings through the legacy CRTC
+ * API, and verify through atomic.
+ */
igt_plane_set_fb(plane, fb);
crtc_commit(pipe, plane, COMMIT_LEGACY, CRTC_RELAX_MODE);
- /* Set the plane through the universal setplane API, and
- * verify through atomic. */
+ /*
+ * Set the plane through the universal setplane API, and
+ * verify through atomic.
+ */
igt_plane_set_fb(plane, &fb2);
plane_commit(plane, COMMIT_UNIVERSAL, ATOMIC_RELAX_NONE);
}
-/* test to ensure that DRM_MODE_ATOMIC_TEST_ONLY really only touches the
- * free-standing state objects and nothing else.
- */
-static void test_only(igt_pipe_t *pipe_obj,
- igt_plane_t *primary,
- igt_output_t *output)
+static void test_only(igt_pipe_t *pipe_obj, igt_plane_t *primary,
+ igt_output_t *output, uint32_t format)
{
drmModeModeInfo *mode = igt_output_get_mode(output);
- uint32_t format = plane_get_igt_format(primary);
struct igt_fb fb;
uint64_t old_plane_values[IGT_NUM_PLANE_PROPS], old_crtc_values[IGT_NUM_CRTC_PROPS];
- igt_require(format != 0);
-
plane_get_current_state(primary, old_plane_values);
crtc_get_current_state(pipe_obj, old_crtc_values);
@@ -606,7 +603,7 @@ static void test_only(igt_pipe_t *pipe_obj,
igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
- /* check the state, should still be old state */
+ /* Check the state, should still be old state */
crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
@@ -625,11 +622,11 @@ static void test_only(igt_pipe_t *pipe_obj,
igt_display_commit_atomic(pipe_obj->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
- /* for extra stress, go through dpms off/on cycle */
+ /* For extra stress, go through dpms off/on cycle */
kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_OFF);
kmstest_set_connector_dpms(output->display->drm_fd, output->config.connector, DRM_MODE_DPMS_ON);
- /* check the state, should still be old state */
+ /* Check the state, should still be old state */
crtc_check_current_state(pipe_obj, old_crtc_values, old_plane_values, ATOMIC_RELAX_NONE);
plane_check_current_state(primary, old_plane_values, ATOMIC_RELAX_NONE);
@@ -659,8 +656,10 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
DRM_FORMAT_MOD_LINEAR,
0.0, 0.0, 0.0, &fb);
- /* Flip the cursor plane using the atomic API, and double-check
- * state is what we think it should be. */
+ /*
+ * Flip the cursor plane using the atomic API, and double-check
+ * state is what we think it should be.
+ */
igt_plane_set_fb(cursor, &fb);
igt_plane_set_position(cursor, x, y);
plane_commit(cursor, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -670,8 +669,10 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
igt_plane_set_position(cursor, 0, 0);
plane_commit(cursor, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Re-enable the plane through the legacy cursor API, and verify
- * through atomic. */
+ /*
+ * Re-enable the plane through the legacy cursor API, and verify
+ * through atomic.
+ */
igt_plane_set_fb(cursor, &fb);
igt_plane_set_position(cursor, x, y);
plane_commit(cursor, COMMIT_LEGACY, PLANE_RELAX_FB);
@@ -680,8 +681,10 @@ static void plane_cursor(igt_pipe_t *pipe_obj,
igt_plane_set_position(cursor, x - 16, y - 16);
plane_commit(cursor, COMMIT_LEGACY, PLANE_RELAX_FB);
- /* Restore the plane to its original settings through the legacy cursor
- * API, and verify through atomic. */
+ /*
+ * Restore the plane to its original settings through the legacy cursor
+ * API, and verify through atomic.
+ */
igt_plane_set_fb(cursor, NULL);
igt_plane_set_position(cursor, 0, 0);
plane_commit(cursor, COMMIT_LEGACY, ATOMIC_RELAX_NONE);
@@ -694,7 +697,7 @@ static void plane_invalid_params(igt_pipe_t *pipe,
{
struct igt_fb fb2;
- /* Pass a series of invalid object IDs for the FB ID. */
+ /* Pass a series of invalid object IDs for the FB ID */
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, plane->drm_plane->plane_id);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -707,14 +710,14 @@ static void plane_invalid_params(igt_pipe_t *pipe,
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->values[IGT_CRTC_MODE_ID]);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
- /* Valid, but invalid because CRTC_ID is set. */
+ /* Valid, but invalid because CRTC_ID is set */
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, 0);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
igt_plane_set_fb(plane, fb);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Pass a series of invalid object IDs for the CRTC ID. */
+ /* Pass a series of invalid object IDs for the CRTC ID */
igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, plane->drm_plane->plane_id);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -727,14 +730,14 @@ static void plane_invalid_params(igt_pipe_t *pipe,
igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->values[IGT_CRTC_MODE_ID]);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
- /* Valid, but invalid because FB_ID is set. */
+ /* Valid, but invalid because FB_ID is set */
igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, 0);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
igt_plane_set_fb(plane, fb);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* Create a framebuffer too small for the plane configuration. */
+ /* Create a framebuffer too small for the plane configuration */
igt_create_pattern_fb(pipe->display->drm_fd,
fb->width - 1, fb->height - 1,
fb->drm_format, I915_TILING_NONE, &fb2);
@@ -742,7 +745,7 @@ static void plane_invalid_params(igt_pipe_t *pipe,
igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, fb2.fb_id);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, ENOSPC);
- /* Restore the primary plane and check the state matches the old. */
+ /* Restore the primary plane and check the state matches the old */
igt_plane_set_fb(plane, fb);
plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
@@ -757,7 +760,7 @@ static void plane_invalid_params_fence(igt_pipe_t *pipe,
timeline = sw_sync_timeline_create();
- /* invalid fence fd */
+ /* Invalid fence fd */
igt_plane_set_fence_fd(plane, pipe->display->drm_fd);
plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -784,7 +787,7 @@ static void crtc_invalid_params(igt_pipe_t *pipe,
uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
drmModeModeInfo *mode = igt_output_get_mode(output);
- /* Pass a series of invalid object IDs for the mode ID. */
+ /* Pass a series of invalid object IDs for the mode ID */
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, plane->drm_plane->plane_id);
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -810,7 +813,7 @@ static void crtc_invalid_params(igt_pipe_t *pipe,
DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* Create a blob which is the wrong size to be a valid mode. */
+ /* Create a blob which is the wrong size to be a valid mode */
igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode) - 1);
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
@@ -818,7 +821,7 @@ static void crtc_invalid_params(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EINVAL);
- /* Restore the CRTC and check the state matches the old. */
+ /* Restore the CRTC and check the state matches the old */
igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_MODE_ID, mode, sizeof(*mode));
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
@@ -837,7 +840,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
timeline = sw_sync_timeline_create();
- /* invalid out_fence_ptr */
+ /* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
@@ -845,7 +848,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
- /* invalid out_fence_ptr */
+ /* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
@@ -853,7 +856,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
- /* invalid out_fence_ptr */
+ /* Invalid out_fence_ptr */
map = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
igt_assert(map != MAP_FAILED);
@@ -861,7 +864,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
munmap(map, PAGE_SIZE);
- /* valid in fence but not allowed prop on crtc */
+ /* Valid in fence but not allowed prop on crtc */
fence_fd = sw_sync_timeline_create_fence(timeline, 1);
igt_plane_set_fence_fd(plane, fence_fd);
@@ -870,12 +873,12 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
crtc_commit_atomic_flags_err(pipe, plane, 0, ATOMIC_RELAX_NONE, EINVAL);
- /* valid out fence ptr and flip event but not allowed prop on crtc */
+ /* Valid out fence ptr and flip event but not allowed prop on crtc */
igt_pipe_request_out_fence(pipe);
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* valid flip event but not allowed prop on crtc */
+ /* Valid flip event but not allowed prop on crtc */
igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
@@ -889,20 +892,20 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
/* Set invalid prop */
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, fb->fb_id);
- /* valid out fence but invalid prop on crtc */
+ /* Valid out fence but invalid prop on crtc */
igt_pipe_request_out_fence(pipe);
crtc_commit_atomic_flags_err(pipe, plane, 0,
ATOMIC_RELAX_NONE, EINVAL);
- /* valid out fence ptr and flip event but invalid prop on crtc */
+ /* Valid out fence ptr and flip event but invalid prop on crtc */
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* valid page flip event but invalid prop on crtc */
+ /* Valid page flip event but invalid prop on crtc */
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_PAGE_FLIP_EVENT,
ATOMIC_RELAX_NONE, EINVAL);
- /* successful TEST_ONLY with fences set */
+ /* Successful TEST_ONLY with fences set */
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_MODE_ID, old_mode_id);
crtc_commit_atomic_flags_err(pipe, plane, DRM_MODE_ATOMIC_TEST_ONLY,
ATOMIC_RELAX_NONE, 0);
@@ -910,21 +913,19 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
close(fence_fd);
close(timeline);
- /* reset fences */
+ /* Reset fences */
igt_plane_set_fence_fd(plane, -1);
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, 0);
igt_pipe_obj_clear_prop_changed(pipe, IGT_CRTC_OUT_FENCE_PTR);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
- /* out fence ptr but not page flip event */
+ /* Out fence ptr but not page flip event */
igt_pipe_request_out_fence(pipe);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
igt_assert(pipe->out_fence_fd != -1);
}
-/* Abuse the atomic ioctl directly in order to test various invalid conditions,
- * which the libdrm wrapper won't allow us to create. */
static void atomic_invalid_params(igt_pipe_t *pipe,
igt_plane_t *plane,
igt_output_t *output,
@@ -932,15 +933,15 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
{
igt_display_t *display = pipe->display;
struct drm_mode_atomic ioc;
- uint32_t obj_raw[16]; /* array of objects (sized by count_objs) */
- uint32_t num_props_raw[16]; /* array of num props per obj (ditto) */
- uint32_t props_raw[256]; /* array of props (sum of count_props) */
- uint64_t values_raw[256]; /* array of values for properties (ditto) */
+ uint32_t obj_raw[16]; /* Array of objects (sized by count_objs) */
+ uint32_t num_props_raw[16]; /* Array of num props per obj (ditto) */
+ uint32_t props_raw[256]; /* Array of props (sum of count_props) */
+ uint64_t values_raw[256]; /* Array of values for properties (ditto) */
int i;
memset(&ioc, 0, sizeof(ioc));
- /* An empty request should do nothing. */
+ /* An empty request should do nothing */
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
@@ -957,44 +958,44 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
ioc.props_ptr = (uintptr_t) props_raw;
ioc.prop_values_ptr = (uintptr_t) values_raw;
- /* Valid pointers, but still should copy nothing. */
+ /* Valid pointers, but still should copy nothing */
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Valid noop, but with event set should fail. */
+ /* Valid noop, but with event set should fail */
ioc.flags = DRM_MODE_PAGE_FLIP_EVENT;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
- /* Nonsense flags. */
+ /* Nonsense flags */
ioc.flags = 0xdeadbeef;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
ioc.flags = 0;
- /* Safety check that flags is reset properly. */
+ /* Safety check that flags is reset properly */
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Reserved/MBZ. */
+ /* Reserved/MBZ */
ioc.reserved = 1;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EINVAL);
ioc.reserved = 0;
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Zero is not a valid object ID. */
+ /* Zero is not a valid object ID */
ioc.count_objs = ARRAY_SIZE(obj_raw);
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- /* Invalid object type (not a thing we can set properties on). */
+ /* Invalid object type (not a thing we can set properties on) */
ioc.count_objs = 1;
obj_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
obj_raw[0] = fb->fb_id;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- /* Filled object but with no properties; no-op. */
+ /* Filled object but with no properties; no-op */
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
obj_raw[i] = pipe->crtc_id;
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Pass in all sorts of things other than the property ID. */
+ /* Pass in all sorts of things other than the property ID */
num_props_raw[0] = 1;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
props_raw[0] = pipe->crtc_id;
@@ -1006,22 +1007,21 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
props_raw[0] = pipe->values[IGT_CRTC_MODE_ID];
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
- /* Valid property, valid value. */
-
+ /* Valid property, valid value */
for (i = 0; i < ARRAY_SIZE(props_raw); i++) {
props_raw[i] = pipe->props[IGT_CRTC_MODE_ID];
values_raw[i] = pipe->values[IGT_CRTC_MODE_ID];
}
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Setting the same thing multiple times is OK. */
+ /* Setting the same thing multiple times is OK */
for (i = 0; i < ARRAY_SIZE(obj_raw); i++)
num_props_raw[i] = ARRAY_SIZE(props_raw) / ARRAY_SIZE(obj_raw);
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
ioc.count_objs = ARRAY_SIZE(obj_raw);
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Pass a series of outlandish addresses. */
+ /* Pass a series of outlandish addresses */
ioc.objs_ptr = 0;
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, EFAULT);
@@ -1040,7 +1040,7 @@ static void atomic_invalid_params(igt_pipe_t *pipe,
ioc.prop_values_ptr = (uintptr_t) values_raw;
do_ioctl(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc);
- /* Attempt to overflow and/or trip various boundary conditions. */
+ /* Attempt to overflow and/or trip various boundary conditions */
ioc.count_objs = UINT32_MAX / sizeof(uint32_t);
do_ioctl_err(display->drm_fd, DRM_IOCTL_MODE_ATOMIC, &ioc, ENOENT);
@@ -1079,10 +1079,10 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
fb->height/2, 1.0, 1.0, 1.0);
igt_put_cairo_ctx(cr_1);
- /*
- * Flip the primary plane to new color fb using atomic API and check the
- * state.
- */
+ /*
+ * Flip the primary plane to new color fb using atomic API and check the
+ * state.
+ */
igt_plane_set_fb(plane, &fb_1);
crtc_commit(pipe, plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
@@ -1138,7 +1138,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
* NOTE: This will result in no update on plane as damage is outside, so
* will see no change on the screen.
*/
- /* Reszie fb_1 to be bigger than plane */
+ /* Resize fb_1 to be bigger than plane */
igt_remove_fb(pipe->display->drm_fd, &fb_1);
igt_create_color_fb(pipe->display->drm_fd, fb->width * 2, fb->height,
fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
@@ -1263,15 +1263,18 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
igt_remove_fb(pipe->display->drm_fd, &fb_2);
}
-static void atomic_setup(igt_display_t *display, enum pipe pipe, igt_output_t *output, igt_plane_t *primary, struct igt_fb *fb)
+static void atomic_setup(igt_display_t *display, enum pipe pipe, igt_output_t *output,
+ igt_plane_t *primary, struct igt_fb *fb)
{
+ igt_display_reset(display);
igt_output_set_pipe(output, pipe);
igt_plane_set_fb(primary, fb);
crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
-static void atomic_clear(igt_display_t *display, enum pipe pipe, igt_plane_t *primary, igt_output_t *output)
+static void atomic_clear(igt_display_t *display, enum pipe pipe,
+ igt_plane_t *primary, igt_output_t *output)
{
igt_plane_t *plane;
@@ -1284,6 +1287,28 @@ static void atomic_clear(igt_display_t *display, enum pipe pipe, igt_plane_t *pr
crtc_commit(primary->pipe, primary, COMMIT_ATOMIC, ATOMIC_RELAX_NONE);
}
+/* Returns true if plane supports zpos property. */
+static bool has_zpos(igt_plane_t *plane)
+{
+ return igt_plane_has_prop(plane, IGT_PLANE_ZPOS);
+}
+
+static void do_cleanup_display(igt_display_t *dpy)
+{
+ enum pipe pipe;
+ igt_output_t *output;
+ igt_plane_t *plane;
+
+ for_each_pipe(dpy, pipe)
+ for_each_plane_on_pipe(dpy, pipe, plane)
+ igt_plane_set_fb(plane, NULL);
+
+ for_each_connected_output(dpy, output)
+ igt_output_set_pipe(output, PIPE_NONE);
+
+ igt_display_commit2(dpy, dpy->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+}
+
igt_main
{
igt_display_t display;
@@ -1296,9 +1321,7 @@ igt_main
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);
-
kmstest_set_vt_graphics_mode();
-
igt_display_require(&display, display.drm_fd);
igt_require(display.is_atomic);
igt_display_require_output(&display);
@@ -1308,9 +1331,7 @@ igt_main
pipe_obj = &display.pipes[pipe];
primary = igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_PRIMARY);
-
mode = igt_output_get_mode(output);
-
igt_create_pattern_fb(display.drm_fd,
mode->hdisplay, mode->vdisplay,
plane_get_igt_format(primary),
@@ -1323,54 +1344,67 @@ igt_main
igt_plane_t *overlay =
igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_OVERLAY);
- igt_require(overlay);
+ if (!overlay)
+ continue;
atomic_setup(&display, pipe, output, primary, &fb);
plane_overlay(pipe_obj, output, overlay);
+ atomic_clear(&display, pipe, primary, output);
}
igt_describe("Test for KMS atomic modesetting on primary plane and ensure coherency between "
"the legacy and atomic interfaces.");
igt_subtest("plane-primary-legacy") {
atomic_setup(&display, pipe, output, primary, &fb);
-
plane_primary(pipe_obj, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Verify that the overlay plane can cover the primary one (and "\
+ igt_describe("Test to verify that the overlay plane can cover the primary one (and "\
"vice versa) by changing their zpos property.");
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));
+ if (!overlay)
+ continue;
- igt_require(igt_plane_has_format_mod(primary, format_primary, 0x0));
- igt_require(igt_plane_has_format_mod(overlay, format_overlay, 0x0));
+ if (!has_zpos(primary) || !has_zpos(overlay))
+ continue;
+
+ if (!igt_plane_has_format_mod(primary, DRM_FORMAT_ARGB8888, 0x0) ||
+ !igt_plane_has_format_mod(overlay, DRM_FORMAT_ARGB1555, 0x0))
+ continue;
igt_output_set_pipe(output, pipe);
plane_primary_overlay_mutable_zpos(pipe_obj, output, primary, overlay,
- format_primary, format_overlay);
+ DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB1555);
+ do_cleanup_display(&display);
}
- igt_describe("Verify the reported zpos property of planes by making sure "\
+ igt_describe("Test to verify the reported zpos property of planes by making sure "\
"only higher zpos planes cover the lower zpos ones.");
igt_subtest("plane-immutable-zpos") {
+ int n_planes = pipe_obj->n_planes;
+
+ if (n_planes < 2)
+ continue;
+
igt_output_set_pipe(output, pipe);
- plane_immutable_zpos(&display, pipe_obj, output);
+ plane_immutable_zpos(&display, pipe_obj, output, primary, n_planes);
+ do_cleanup_display(&display);
}
igt_describe("Test to ensure that DRM_MODE_ATOMIC_TEST_ONLY really only touches "
"the free-standing state objects and nothing else.");
igt_subtest("test-only") {
- atomic_clear(&display, pipe, primary, output);
+ uint32_t format = plane_get_igt_format(primary);
+
+ if (!format)
+ continue;
- test_only(pipe_obj, primary, output);
+ atomic_clear(&display, pipe, primary, output);
+ test_only(pipe_obj, primary, output, format);
}
igt_describe("Test for KMS atomic modesetting on cursor plane and ensure coherency between "
@@ -1379,38 +1413,40 @@ igt_main
igt_plane_t *cursor =
igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_CURSOR);
- igt_require(cursor);
+ if (!cursor)
+ continue;
atomic_setup(&display, pipe, output, primary, &fb);
plane_cursor(pipe_obj, output, cursor);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid plane parameters are passed");
+ igt_describe("Test error handling when invalid plane parameters are passed.");
igt_subtest("plane-invalid-params") {
atomic_setup(&display, pipe, output, primary, &fb);
-
plane_invalid_params(pipe_obj, output, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid plane fence parameters are passed");
+ igt_describe("Test error handling when invalid plane fence parameters are passed.");
igt_subtest("plane-invalid-params-fence") {
atomic_setup(&display, pipe, output, primary, &fb);
-
plane_invalid_params_fence(pipe_obj, output, primary);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid crtc parameters are passed");
+ igt_describe("Test error handling when invalid crtc parameters are passed.");
igt_subtest("crtc-invalid-params") {
atomic_setup(&display, pipe, output, primary, &fb);
-
crtc_invalid_params(pipe_obj, output, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Test error handling when invalid crtc fence parameters are passed");
+ igt_describe("Test error handling when invalid crtc fence parameters are passed.");
igt_subtest("crtc-invalid-params-fence") {
atomic_setup(&display, pipe, output, primary, &fb);
-
crtc_invalid_params_fence(pipe_obj, output, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
igt_describe("Test abuse the atomic ioctl directly in order to test "
@@ -1418,23 +1454,21 @@ igt_main
"allow us to create.");
igt_subtest("atomic-invalid-params") {
atomic_setup(&display, pipe, output, primary, &fb);
-
atomic_invalid_params(pipe_obj, primary, output, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
- igt_describe("Simple test cases to use FB_DAMAGE_CLIPS plane property");
- igt_subtest("atomic_plane_damage") {
- igt_require(igt_plane_has_prop(primary, IGT_PLANE_FB_DAMAGE_CLIPS));
+ igt_describe("Test case to use FB_DAMAGE_CLIPS plane property.");
+ igt_subtest("atomic-plane-damage") {
+ if (!igt_plane_has_prop(primary, IGT_PLANE_FB_DAMAGE_CLIPS))
+ continue;
atomic_setup(&display, pipe, output, primary, &fb);
-
atomic_plane_damage(pipe_obj, primary, &fb);
+ atomic_clear(&display, pipe, primary, output);
}
igt_fixture {
- atomic_clear(&display, pipe, primary, output);
- igt_remove_fb(display.drm_fd, &fb);
-
igt_display_fini(&display);
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-18 16:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-13 5:58 [igt-dev] [PATCH i-g-t v2 1/2] tests/kms_atomic: Test cleanup Swati Sharma
2022-10-13 5:58 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_atomic: Convert tests to dynamic Swati Sharma
2022-10-18 16:15 ` Modem, Bhanuprakash
2022-10-13 6:52 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup Patchwork
2022-10-13 8:10 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2022-10-12 17:04 [igt-dev] [PATCH i-g-t v2 1/2] " Swati Sharma
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.