From: Mika Kahola <mika.kahola@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v4 2/7] tests/kms_plane_multiple: Add TEST_ONLY flag Cc: maarten.lankhorst@linux.intel.com
Date: Thu, 23 Mar 2017 14:48:25 +0200 [thread overview]
Message-ID: <1490273311-9794-3-git-send-email-mika.kahola@intel.com> (raw)
In-Reply-To: <1490273311-9794-1-git-send-email-mika.kahola@intel.com>
Add TEST_ONLY flag to test atomic modesetting commits without
actual real-life commit.
v2: Use flag to indicate to test with TEST_ONLY flag with atomic
commit
v3: Moved force_test_atomic flag set to 'test_plane_position()'
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
---
tests/kms_plane_multiple.c | 48 ++++++++++++++++++++++++++++++++++++----------
1 file changed, 38 insertions(+), 10 deletions(-)
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 93dce6b..84fd411 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -365,7 +365,8 @@ test_legacy_plane_position_with_output(data_t *data, enum pipe pipe,
}
static void
-test_plane_position(data_t *data, enum pipe pipe, bool atomic, uint64_t tiling)
+test_plane_position(data_t *data, enum pipe pipe, bool atomic,
+ bool force_test_atomic, uint64_t tiling)
{
igt_output_t *output;
int connected_outs;
@@ -379,6 +380,8 @@ test_plane_position(data_t *data, enum pipe pipe, bool atomic, uint64_t tiling)
tiling == LOCAL_I915_FORMAT_MOD_Yf_TILED))
igt_require(AT_LEAST_GEN(devid, 9));
+ data->display.force_test_atomic = force_test_atomic;
+
if (!opt.user_seed)
opt.seed = time(NULL);
@@ -421,46 +424,71 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
igt_require(data->display.pipes[pipe].n_planes > 0);
}
-
igt_subtest_f("legacy-pipe-%s-tiling-none",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, false, LOCAL_DRM_FORMAT_MOD_NONE);
+ test_plane_position(data, pipe, false, false,
+ LOCAL_DRM_FORMAT_MOD_NONE);
igt_subtest_f("atomic-pipe-%s-tiling-none",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, true, LOCAL_I915_FORMAT_MOD_X_TILED);
+ test_plane_position(data, pipe, true, false,
+ LOCAL_I915_FORMAT_MOD_X_TILED);
igt_subtest_f("legacy-pipe-%s-tiling-x",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, false, LOCAL_I915_FORMAT_MOD_X_TILED);
+ test_plane_position(data, pipe, false, false,
+ LOCAL_I915_FORMAT_MOD_X_TILED);
igt_subtest_f("atomic-pipe-%s-tiling-x",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, true, LOCAL_I915_FORMAT_MOD_X_TILED);
+ test_plane_position(data, pipe, true, false,
+ LOCAL_I915_FORMAT_MOD_X_TILED);
igt_subtest_f("legacy-pipe-%s-tiling-y",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, false, LOCAL_I915_FORMAT_MOD_Y_TILED);
+ test_plane_position(data, pipe, false, false,
+ LOCAL_I915_FORMAT_MOD_Y_TILED);
igt_subtest_f("atomic-pipe-%s-tiling-y",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, true, LOCAL_I915_FORMAT_MOD_Y_TILED);
+ test_plane_position(data, pipe, true, false,
+ LOCAL_I915_FORMAT_MOD_Y_TILED);
igt_subtest_f("legacy-pipe-%s-tiling-yf",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, false, LOCAL_I915_FORMAT_MOD_Yf_TILED);
+ test_plane_position(data, pipe, false, false,
+ LOCAL_I915_FORMAT_MOD_Yf_TILED);
igt_subtest_f("atomic-pipe-%s-tiling-yf",
kmstest_pipe_name(pipe))
for_each_valid_output_on_pipe(&data->display, pipe, output)
- test_plane_position(data, pipe, true, LOCAL_I915_FORMAT_MOD_Yf_TILED);
+ test_plane_position(data, pipe, true, false,
+ LOCAL_I915_FORMAT_MOD_Yf_TILED);
+
+ igt_subtest_f("atomic-pipe-%s-tiling-x-with-test",
+ kmstest_pipe_name(pipe))
+ for_each_valid_output_on_pipe(&data->display, pipe, output)
+ test_plane_position(data, pipe, true, true,
+ LOCAL_I915_FORMAT_MOD_X_TILED);
+
+ igt_subtest_f("atomic-pipe-%s-tiling-y-with-test",
+ kmstest_pipe_name(pipe))
+ for_each_valid_output_on_pipe(&data->display, pipe, output)
+ test_plane_position(data, pipe, true, true,
+ LOCAL_I915_FORMAT_MOD_X_TILED);
+
+ igt_subtest_f("atomic-pipe-%s-tiling-yf-with-test",
+ kmstest_pipe_name(pipe))
+ for_each_valid_output_on_pipe(&data->display, pipe, output)
+ test_plane_position(data, pipe, true, true,
+ LOCAL_I915_FORMAT_MOD_X_TILED);
}
static data_t data;
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-03-23 12:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 12:48 [PATCH i-g-t v4 0/7] Validate TEST_ONLY correctness against full atomic commit Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 1/7] lib/igt_kms: Add forcing TEST_ONLY for atomic commits Mika Kahola
2017-03-23 12:48 ` Mika Kahola [this message]
2017-03-23 13:02 ` [PATCH i-g-t v4 2/7] tests/kms_plane_multiple: Add TEST_ONLY flag Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 2/3] tests/kms_plane_multiple: Add TEST_ONLY flag Cc: maarten.lankhorst@linux.intel.com Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 3/7] tests/kms_atomic_transition: Add TEST_ONLY flag Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 4/7] tests/kms_plane_scaling: " Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 5/7] tests/kms_rotation_crc: " Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 6/7] tests/kms_plane_lowres: " Mika Kahola
2017-03-23 12:48 ` [PATCH i-g-t v4 7/7] tests/kms_cursor_legacy: " Mika Kahola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490273311-9794-3-git-send-email-mika.kahola@intel.com \
--to=mika.kahola@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.