[igt,4/9] igt/vc4_wait_bo: Add a test for VC4's wait-for-BO ioctl.

Commit Message

Eric Anholt Feb. 3, 2016, 9:41 p.m. UTC

The pad subtest fails currently.

Signed-off-by: Eric Anholt <[e-mail]>
---
 tests/Makefile.am      |  2 ++
 tests/Makefile.sources |  1 +
 tests/vc4_wait_bo.c    | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 tests/vc4_wait_bo.c

Comments

Daniel Stone Feb. 4, 2016, 3:22 p.m. UTC | #1

Hi,

On 3 February 2016 at 21:41, Eric Anholt <[e-mail]> wrote:
> +               ret = ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &arg);
> +               igt_assert(ret == -1 && errno == EINVAL);

A couple of nitpicks: all these should be either do_ioctl() for
success, or do_ioctl_err() for failure, which not only cuts down the
number of lines a bit, but also shows you the exact condition which
occurred (e.g. it'll show that errno was -EBUSY rather than expected
-EINVAL without having to round-trip through the reporter). Similarly,
all your igt_assert(x == y) should be igt_assert_eq(x, y), or any of
the igt_assert_{eq,neq} variants, e.g. _u32 for comparing uint32_t.
You can also use do_or_die(foo) as shorthand for igt_assert_eq(foo,
0).

With those addressed:
Reviewed-by: Daniel Stone <[e-mail]>

Cheers,
Daniel

Eric Anholt Feb. 4, 2016, 9:43 p.m. UTC | #2

Daniel Stone <[e-mail]> writes:

> Hi,
>
> On 3 February 2016 at 21:41, Eric Anholt <[e-mail]> wrote:
>> +               ret = ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &arg);
>> +               igt_assert(ret == -1 && errno == EINVAL);
>
> A couple of nitpicks: all these should be either do_ioctl() for
> success, or do_ioctl_err() for failure, which not only cuts down the
> number of lines a bit, but also shows you the exact condition which
> occurred (e.g. it'll show that errno was -EBUSY rather than expected
> -EINVAL without having to round-trip through the reporter). Similarly,
> all your igt_assert(x == y) should be igt_assert_eq(x, y), or any of
> the igt_assert_{eq,neq} variants, e.g. _u32 for comparing uint32_t.
> You can also use do_or_die(foo) as shorthand for igt_assert_eq(foo,
> 0).
>
> With those addressed:
> Reviewed-by: Daniel Stone <[e-mail]>

I converted everything but one of the ones in wait_bo, and pushed the
updated series to the vc4 branch of my tree.  I'll give it another
couple of days in case anyone else has review to do on the series.

Thanks!

Patch

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fbc0d62..791564d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -101,6 +101,8 @@  prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
 prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
+vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
+vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
 vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
 vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS)
 endif
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 87cdd71..49dd61e 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -5,6 +5,7 @@  NOUVEAU_TESTS_M = \
 	$(NULL)
 
 VC4_TESTS_M = \
+	vc4_wait_bo \
 	vc4_wait_seqno \
 	$(NULL)
 
diff --git a/tests/vc4_wait_bo.c b/tests/vc4_wait_bo.c
new file mode 100644
index 0000000..081ee09
--- /dev/null
+++ b/tests/vc4_wait_bo.c
@@ -0,0 +1,93 @@ 
+/*
+ * Copyright © 2016 Broadcom
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "igt.h"
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include "vc4_drm.h"
+
+igt_main
+{
+	int ret;
+	int fd;
+	int bo_handle;
+
+	igt_fixture {
+		struct drm_vc4_create_bo create = {
+			.size = 4096,
+		};
+
+		fd = drm_open_driver(DRIVER_VC4);
+
+		ret = ioctl(fd, DRM_IOCTL_VC4_CREATE_BO, &create);
+		igt_assert(ret == 0);
+		bo_handle = create.handle;
+	}
+
+	igt_subtest("bad-bo") {
+		struct drm_vc4_wait_bo arg = {
+			.handle = bo_handle + 1,
+			.timeout_ns = 0,
+		};
+		ret = ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &arg);
+		igt_assert(ret == -1 && errno == EINVAL);
+	}
+
+	igt_subtest("bad-pad") {
+		struct drm_vc4_wait_bo arg = {
+			.pad = 1,
+			.handle = bo_handle,
+			.timeout_ns = 0,
+		};
+		ret = ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &arg);
+		igt_assert(ret == -1 && errno == EINVAL);
+	}
+
+	igt_subtest("unused-bo-0ns") {
+		struct drm_vc4_wait_bo arg = {
+			.handle = bo_handle,
+			.timeout_ns = 0,
+		};
+		ret = ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &arg);
+		igt_assert(ret == 0);
+	}
+
+	igt_subtest("unused-bo-1ns") {
+		struct drm_vc4_wait_bo arg = {
+			.handle = bo_handle,
+			.timeout_ns = 1,
+		};
+		ret = ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &arg);
+		igt_assert(ret == 0);
+	}
+
+	igt_fixture
+		close(fd);
+}