From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v2 7/8] igt/kms_rotation_crc : Fix flip tests for sprite plane
Date: Wed, 27 Sep 2017 20:16:34 +0200 [thread overview]
Message-ID: <20170927181635.21170-8-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20170927181635.21170-1-maarten.lankhorst@linux.intel.com>
This test was flipping the primary plane instead of the sprite plane.
Flip the correct plane to make the test pass properly.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
tests/kms_rotation_crc.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 4932a0d44410..b8327dfa0d83 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -332,6 +332,9 @@ static void test_plane_rotation(data_t *data, int plane_type)
enum igt_commit_style commit = COMMIT_LEGACY;
int ret;
+ if (data->flips && plane_type != DRM_PLANE_TYPE_PRIMARY)
+ igt_require(data->display.is_atomic);
+
if (plane_type == DRM_PLANE_TYPE_PRIMARY || plane_type == DRM_PLANE_TYPE_CURSOR)
commit = COMMIT_UNIVERSAL;
@@ -390,12 +393,20 @@ static void test_plane_rotation(data_t *data, int plane_type)
* check CRC against that one as well.
*/
if (data->flips) {
- ret = drmModePageFlip(data->gfx_fd,
- output->config.crtc->crtc_id,
- data->fb_flip.fb_id,
- DRM_MODE_PAGE_FLIP_EVENT,
- NULL);
- igt_assert_eq(ret, 0);
+ igt_plane_set_fb(plane, &data->fb_flip);
+ if (data->rotation == IGT_ROTATION_90 || data->rotation == IGT_ROTATION_270)
+ igt_plane_set_size(plane, data->fb.height, data->fb.width);
+
+ if (plane_type != DRM_PLANE_TYPE_PRIMARY) {
+ igt_display_commit_atomic(display, DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK, NULL);
+ } else {
+ ret = drmModePageFlip(data->gfx_fd,
+ output->config.crtc->crtc_id,
+ data->fb_flip.fb_id,
+ DRM_MODE_PAGE_FLIP_EVENT,
+ NULL);
+ igt_assert_eq(ret, 0);
+ }
wait_for_pageflip(data->gfx_fd);
igt_pipe_crc_collect_crc(data->pipe_crc,
&crc_output);
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-09-27 18:16 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 18:16 [PATCH i-g-t v2 0/8] lib/igt_kms: Convert properties to be more atomic-like Maarten Lankhorst
2017-09-27 18:16 ` [PATCH i-g-t v2 1/8] tests: Stop looking at plane private members Maarten Lankhorst
2017-09-27 18:16 ` [PATCH i-g-t v2 2/8] lib/igt_kms: Change output->pending_crtc_idx_mask to output->pending_pipe Maarten Lankhorst
2017-09-27 18:16 ` [PATCH i-g-t v2 3/8] lib/igt_kms: Commit primary plane when a modeset is forced on a pipe Maarten Lankhorst
2017-09-27 18:16 ` [PATCH i-g-t v2 4/8] lib/igt_kms: Rework connector properties to be more atomic, v2 Maarten Lankhorst
2017-09-27 18:16 ` [PATCH i-g-t v2 5/8] lib/igt_kms: Rework plane " Maarten Lankhorst
2017-09-28 10:28 ` [PATCH i-g-t v2 5/8] lib/igt_kms: Rework plane properties to be more atomic, v3 Maarten Lankhorst
2017-09-28 11:01 ` [PATCH i-g-t v2 5/8] lib/igt_kms: Rework plane properties to be more atomic, v4 Maarten Lankhorst
2017-09-29 9:52 ` [PATCH i-g-t] lib/igt_kms: Rework pipe properties to be more atomic, v4.1 Maarten Lankhorst
2017-09-27 18:16 ` [PATCH i-g-t v2 6/8] lib/igt_kms: Rework pipe properties to be more atomic, v2 Maarten Lankhorst
2017-09-28 10:28 ` [PATCH i-g-t v2 6/8] lib/igt_kms: Rework pipe properties to be more atomic, v3 Maarten Lankhorst
2017-09-29 6:50 ` [PATCH i-g-t] lib/igt_kms: Rework pipe properties to be more atomic, v4 Maarten Lankhorst
2017-09-27 18:16 ` Maarten Lankhorst [this message]
2017-09-27 18:16 ` [PATCH i-g-t v2 8/8] tests: Rename kms_pipe_color to kms_color Maarten Lankhorst
2017-09-29 10:00 ` Mika Kahola
2017-09-27 18:39 ` ✓ Fi.CI.BAT: success for lib/igt_kms: Convert properties to be more atomic-like. (rev2) Patchwork
2017-09-27 22:51 ` ✗ Fi.CI.IGT: failure " Patchwork
2017-09-28 10:50 ` ✓ Fi.CI.BAT: success for lib/igt_kms: Convert properties to be more atomic-like. (rev4) Patchwork
2017-09-28 11:23 ` ✓ Fi.CI.BAT: success for lib/igt_kms: Convert properties to be more atomic-like. (rev5) Patchwork
2017-09-28 11:47 ` ✗ Fi.CI.IGT: failure for lib/igt_kms: Convert properties to be more atomic-like. (rev4) Patchwork
2017-09-28 12:34 ` ✗ Fi.CI.IGT: failure for lib/igt_kms: Convert properties to be more atomic-like. (rev5) Patchwork
2017-09-28 13:01 ` ✗ Fi.CI.IGT: failure for lib/igt_kms: Convert properties to be more atomic-like. (rev4) Patchwork
2017-09-28 13:04 ` ✗ Fi.CI.IGT: failure for lib/igt_kms: Convert properties to be more atomic-like. (rev5) Patchwork
2017-09-28 16:09 ` ✗ Fi.CI.IGT: failure for lib/igt_kms: Convert properties to be more atomic-like. (rev2) Patchwork
2017-09-29 6:58 ` ✗ Fi.CI.BAT: failure for lib/igt_kms: Convert properties to be more atomic-like. (rev6) Patchwork
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=20170927181635.21170-8-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox