From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
To: igt-dev@lists.freedesktop.org
Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Subject: [PATCH i-g-t v2 1/2] tests/kms_rotation_crc: move plane rotation requirements into helper
Date: Mon, 4 Nov 2024 21:44:14 +0200 [thread overview]
Message-ID: <20241104194415.563277-1-juhapekka.heikkila@gmail.com> (raw)
move plane rotation requirement block into helper function.
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.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 9888ac6ac..e8b6e4ff2 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -564,6 +564,22 @@ static bool test_format(data_t *data,
return true;
}
+static bool plane_rotation_requirements(data_t *data, igt_plane_t *plane)
+{
+ if (!igt_plane_has_prop(plane, IGT_PLANE_ROTATION))
+ return false;
+
+ if (!igt_plane_has_rotation(plane, data->rotation))
+ return false;
+
+ /* CHV can't rotate and reflect simultaneously */
+ if (!(!is_intel_device(data->gfx_fd) || !IS_CHERRYVIEW(data->devid) ||
+ data->rotation != (IGT_ROTATION_180 | IGT_REFLECT_X)))
+ return false;
+
+ return true;
+}
+
static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_format)
{
igt_display_t *display = &data->display;
@@ -632,12 +648,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
igt_output_set_pipe(output, pipe);
plane = igt_output_get_plane_type(output, plane_type);
- igt_require(igt_plane_has_prop(plane, IGT_PLANE_ROTATION));
- igt_require(igt_plane_has_rotation(plane, data->rotation));
- /* CHV can't rotate and reflect simultaneously */
- igt_require(!is_intel_device(data->gfx_fd) ||
- !IS_CHERRYVIEW(data->devid) ||
- data->rotation != (IGT_ROTATION_180 | IGT_REFLECT_X));
+ igt_require(plane_rotation_requirements(data, plane));
prepare_crtc(data, output, pipe, plane, true);
--
2.45.2
next reply other threads:[~2024-11-04 19:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-04 19:44 Juha-Pekka Heikkila [this message]
2024-11-04 19:44 ` [PATCH i-g-t v2 2/2] tests/kms_rotation_crc: Intel display version 20 onwards doesn't do hflip with tile4 Juha-Pekka Heikkila
2024-11-06 10:54 ` Karthik B S
2024-11-04 21:07 ` ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/2] tests/kms_rotation_crc: move plane rotation requirements into helper Patchwork
2024-11-04 21:42 ` ✓ CI.xeBAT: " Patchwork
2024-11-05 13:03 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-11-05 16:51 ` ✗ CI.xeFULL: " Patchwork
2024-11-06 10:53 ` [PATCH i-g-t v2 1/2] " Karthik B S
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=20241104194415.563277-1-juhapekka.heikkila@gmail.com \
--to=juhapekka.heikkila@gmail.com \
--cc=igt-dev@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