From: Robert Foss <robert.foss@collabora.com>
To: intel-gfx@lists.freedesktop.org,
Gustavo Padovan <gustavo.padovan@collabora.com>,
Daniel Stone <daniels@collabora.com>,
Daniel Vetter <daniel@ffwll.ch>,
Marius Vlad <marius.c.vlad@intel.com>,
Eric Engestrom <eric@engestrom.ch>,
Chris Wilson <chris@chris-wilson.co.uk>,
Tomeu Vizoso <tomeu@tomeuvizoso.net>
Subject: [PATCH i-g-t v10 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support
Date: Tue, 6 Dec 2016 21:52:09 -0500 [thread overview]
Message-ID: <20161207025213.11669-18-robert.foss@collabora.com> (raw)
In-Reply-To: <20161207025213.11669-1-robert.foss@collabora.com>
Add igt_require_sw_sync to provide tests to skip if sw_sync support isn't
available on the host machine.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
lib/sw_sync.c | 22 ++++++++++++++++++++++
lib/sw_sync.h | 1 +
2 files changed, 23 insertions(+)
diff --git a/lib/sw_sync.c b/lib/sw_sync.c
index a2168f78..d4ecc898 100644
--- a/lib/sw_sync.c
+++ b/lib/sw_sync.c
@@ -194,3 +194,25 @@ int sync_fence_count_status(int fd, int status)
igt_assert_f(count >= 0, "No fences with supplied status found");
return count;
}
+
+static bool kernel_has_sw_sync(void)
+{
+ bool err;
+
+ igt_ignore_warn(system("/sbin/modprobe -s r sw_sync"));
+
+ err = false;
+ if (access(DEVFS_SW_SYNC, R_OK | W_OK) < 0) {
+ char buf[128];
+
+ snprintf(buf, sizeof(buf), "%s/sw_sync", igt_debugfs_mount());
+ err = access(DEBUGFS_SW_SYNC, R_OK | W_OK) < 0;
+ }
+
+ return !err;
+}
+
+void igt_require_sw_sync(void)
+{
+ igt_require(kernel_has_sw_sync());
+}
diff --git a/lib/sw_sync.h b/lib/sw_sync.h
index cea5a603..82af3378 100644
--- a/lib/sw_sync.h
+++ b/lib/sw_sync.h
@@ -39,6 +39,7 @@ int sync_merge(int fd1, int fd2);
int sync_wait(int fence, int timeout);
int sync_fence_count(int fd);
int sync_fence_count_status(int fd, int status);
+void igt_require_sw_sync(void);
#endif
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-12-07 2:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 2:51 [PATCH i-g-t v10 00/21] Implement sw_sync test Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 02/21] test/sw_sync: Add sw_sync test Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 03/21] tests/sw_sync: Add subtest test_alloc_fence Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 04/21] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 05/21] tests/sw_sync: Add subtest test_alloc_merge_fence Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 06/21] tests/sw_sync: Add subtest test_sync_busy Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 07/21] tests/sw_sync: Add subtest test_sync_merge Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 08/21] tests/sw_sync: Add subtest test_sync_merge_same Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 11/21] tests/sw_sync: Add subtest test_sync_random_merge Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 12/21] tests/sw_sync: Add subtest test_sync_multi_timeline_wait Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 13/21] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 14/21] tests/sw_sync: Add subtest test_sync_expired_merge Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 15/21] tests/sw_sync: Add subtest test_timeline_closed Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 16/21] tests/sw_sync: Add subtest test_timeline_closed_signaled Robert Foss
2016-12-07 2:52 ` Robert Foss [this message]
2016-12-07 11:06 ` [PATCH i-g-t v10 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support Petri Latvala
2016-12-07 15:27 ` Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 18/21] tests/sw_sync: Add igt_require check for sw_sync feature Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 20/21] tests/sw_sync: Add subtest test_sync_busy_fork Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 21/21] tests/sw_sync: Add subtest test_sync_busy_unixsocket Robert Foss
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=20161207025213.11669-18-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=daniels@collabora.com \
--cc=eric@engestrom.ch \
--cc=gustavo.padovan@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marius.c.vlad@intel.com \
--cc=tomeu@tomeuvizoso.net \
/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