Add TEST_ONLY flag to test atomic scaling without
actually committing the changes.
Signed-off-by: Mika Kahola <mika.kahola@xxxxxxxxx>
---
tests/kms_plane_scaling.c | 152 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 135 insertions(+), 17 deletions(-)
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 368da09..ae3ce40 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -55,9 +55,18 @@ typedef struct {
#define FILE_NAME "1080p-left.png"
+/* Command line parameters. */
+struct {
+ bool test_only;
+} opt = {
+ .test_only = false,
+};
+
static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
- igt_plane_t *plane, drmModeModeInfo *mode, enum igt_commit_style s)
+ igt_plane_t *plane, drmModeModeInfo *mode,
+ enum igt_commit_style s, bool test_only)
{
+ int ret;
igt_display_t *display = &data->display;
igt_output_set_pipe(output, pipe);
@@ -94,7 +103,6 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
igt_plane_set_fb(plane, &data->fb1);
if (s == COMMIT_LEGACY) {
- int ret;
ret = drmModeSetCrtc(data->drm_fd,
plane->pipe->crtc_id,
data->fb_id1,
@@ -103,6 +111,12 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
1,
mode);
igt_assert_eq(ret, 0);
+ } else if (test_only) {
+ ret = igt_display_try_commit2(display,
+ DRM_MODE_ATOMIC_TEST_ONLY |
+ DRM_MODE_ATOMIC_ALLOW_MODESET |
+ COMMIT_ATOMIC);
+ igt_assert_eq(ret, 0);
} else {
igt_display_commit2(display, s);
}
@@ -175,13 +189,14 @@ static void iterate_plane_scaling(data_t *d, drmModeModeInfo *mode)
}
}
-static void test_plane_scaling(data_t *d)
+static void test_plane_scaling(data_t *d, bool test_only)
{
igt_display_t *display = &d->display;
igt_output_t *output;
enum pipe pipe;
int valid_tests = 0;
int primary_plane_scaling = 0; /* For now */
+ int ret;
igt_require(d->num_scalers);
@@ -208,7 +223,7 @@ static void test_plane_scaling(data_t *d)
/* Set up display with plane 1 */
d->plane1 = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
- prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_UNIVERSAL);
+ prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_UNIVERSAL, test_only);
if (primary_plane_scaling) {
/* Primary plane upscaling */
@@ -216,14 +231,30 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb1, d->plane1, 500, 500);
igt_plane_set_position(d->plane1, 0, 0);
igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
/* Primary plane 1:1 no scaling */
igt_fb_set_position(&d->fb1, d->plane1, 0, 0);
igt_fb_set_size(&d->fb1, d->plane1, d->fb1.width, d->fb1.height);
igt_plane_set_position(d->plane1, 0, 0);
igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
}
/* Set up fb2->plane2 mapping. */
@@ -235,7 +266,15 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb2, d->plane2, d->fb2.width-200, d->fb2.height-200);
igt_plane_set_position(d->plane2, 100, 100);
igt_plane_set_size(d->plane2, mode->hdisplay-200, mode->vdisplay-200);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
iterate_plane_scaling(d, mode);
@@ -244,14 +283,30 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb2, d->plane2, 500, 500);
igt_plane_set_position(d->plane2, 10, 10);
igt_plane_set_size(d->plane2, mode->hdisplay-20, mode->vdisplay-20);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
/* 2nd plane downscaling */
igt_fb_set_position(&d->fb2, d->plane2, 0, 0);
igt_fb_set_size(&d->fb2, d->plane2, d->fb2.width, d->fb2.height);
igt_plane_set_position(d->plane2, 10, 10);
igt_plane_set_size(d->plane2, 500, 500 * d->fb2.height/d->fb2.width);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
if (primary_plane_scaling) {
/* Primary plane up scaling */
@@ -259,7 +314,15 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb1, d->plane1, 500, 500);
igt_plane_set_position(d->plane1, 0, 0);
igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
}
/* Set up fb3->plane3 mapping. */
@@ -271,7 +334,15 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width-300, d->fb3.height-300);
igt_plane_set_position(d->plane3, 100, 100);
igt_plane_set_size(d->plane3, mode->hdisplay-300, mode->vdisplay-300);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
/* Switch scaler from plane 2 to plane 3 */
igt_fb_set_position(&d->fb2, d->plane2, 100, 100);
@@ -283,7 +354,15 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width-400, d->fb3.height-400);
igt_plane_set_position(d->plane3, 10, 10);
igt_plane_set_size(d->plane3, mode->hdisplay-300, mode->vdisplay-300);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
if (primary_plane_scaling) {
/* Switch scaler from plane 1 to plane 2 */
@@ -296,13 +375,29 @@ static void test_plane_scaling(data_t *d)
igt_fb_set_size(&d->fb2, d->plane2, d->fb2.width-500,d->fb2.height-500);
igt_plane_set_position(d->plane2, 100, 100);
igt_plane_set_size(d->plane2, mode->hdisplay-200, mode->vdisplay-200);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
}
/* back to single plane mode */
igt_plane_set_fb(d->plane2, NULL);
igt_plane_set_fb(d->plane3, NULL);
- igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+ if (test_only) {
+ ret = igt_display_try_commit_atomic(&d->display,
+ DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ igt_assert_eq(ret, 0);
+ } else {
+ igt_display_commit2(display, COMMIT_UNIVERSAL);
+ }
valid_tests++;
cleanup_crtc(d, output, d->plane1);
@@ -310,12 +405,35 @@ static void test_plane_scaling(data_t *d)
igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
}
-igt_simple_main
+static int opt_handler(int option, int option_index, void *input)
+{
+ switch (option) {
+ case 't':
+ opt.test_only = true;
+ break;
+ default:
+ igt_assert(false);
+ }
+
+ return 0;
+}
+
+const char *help_str =
+ " --test-only test only atomic commit\n";
+
+int main(int argc, char *argv[])
{
data_t data = {};
- igt_skip_on_simulation();
+ struct option long_options[] = {
+ { "test-only", no_argument, NULL, 't'},
+ { 0, 0, 0, 0 }
+ };
+ igt_subtest_init_parse_opts(&argc, argv, "", long_options, help_str,
+ opt_handler, NULL);
+
+ igt_skip_on_simulation();
data.drm_fd = drm_open_driver(DRIVER_INTEL);
igt_require_pipe_crc();
@@ -324,7 +442,7 @@ igt_simple_main
data.num_scalers = intel_gen(data.devid) >= 9 ? 2 : 0;
- test_plane_scaling(&data);
+ test_plane_scaling(&data, opt.test_only);
igt_display_fini(&data.display);
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
