On Mon, Apr 10, 2017 at 06:24:32PM -0700, Eric Anholt wrote:
> This successfully catches vc4's lack of dmabuf fencing.
>
> Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
> ---
>
> Has anyone looked into shared infrastructure for tests to do
> KMS/dmabuf/etc. things with a generic "get a BO that's being rendered
> to for this driver" call?
We have some helpers for i915 to make a bo busy with an explicit release
(we create a looping batch which we break with a cpu write), for extremely
well-control busy tests. Not sure how well that's portable, and without
full control it's hard to make busy tests reliable.
-Daniel
>
> tests/Makefile.am | 2 ++
> tests/Makefile.sources | 1 +
> tests/vc4_dmabuf_poll.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 88 insertions(+)
> create mode 100644 tests/vc4_dmabuf_poll.c
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 8930c245043d..7c40c9ea8276 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -114,6 +114,8 @@ vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
> vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
> vc4_lookup_fail_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
> vc4_lookup_fail_LDADD = $(LDADD) $(DRM_VC4_LIBS)
> +vc4_dmabuf_poll_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
> +vc4_dmabuf_poll_LDADD = $(LDADD) $(DRM_VC4_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)
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 6e07d9387f83..b579e28c6669 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -6,6 +6,7 @@ NOUVEAU_TESTS_M = \
>
> VC4_TESTS_M = \
> vc4_create_bo \
> + vc4_dmabuf_poll \
> vc4_lookup_fail \
> vc4_wait_bo \
> vc4_wait_seqno \
> diff --git a/tests/vc4_dmabuf_poll.c b/tests/vc4_dmabuf_poll.c
> new file mode 100644
> index 000000000000..ac44d4cf80c7
> --- /dev/null
> +++ b/tests/vc4_dmabuf_poll.c
> @@ -0,0 +1,85 @@
> +/*
> + * Copyright © 2017 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 "igt_vc4.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 <poll.h>
> +#include "vc4_drm.h"
> +
> +static void
> +poll_write_bo_test(int fd, int poll_flag)
> +{
> + size_t size = 1024 * 1024 * 4;
> + uint32_t clearval = 0xaabbccdd;
> + /* Get a BO that's being rendered to. */
> + int handle = igt_vc4_get_cleared_bo(fd, size, clearval);
> + int dmabuf_fd = prime_handle_to_fd(fd, handle);
> + struct pollfd p = {
> + .fd = dmabuf_fd,
> + .events = POLLIN,
> + };
> + struct drm_vc4_wait_bo wait = {
> + .handle = handle,
> + .timeout_ns = 0,
> + };
> +
> + /* Block for a couple of minutes waiting for rendering to complete. */
> + int poll_ret = poll(&p, 1, 120 * 1000);
> + igt_assert(poll_ret == 1);
> +
> + /* Now that we've waited for idle, a nonblocking wait for the
> + * BO should pass.
> + */
> + do_ioctl(fd, DRM_IOCTL_VC4_WAIT_BO, &wait);
> +
> + close(dmabuf_fd);
> + gem_close(fd, handle);
> +}
> +
> +igt_main
> +{
> + int fd;
> +
> + igt_fixture
> + fd = drm_open_driver(DRIVER_VC4);
> +
> + igt_subtest("poll-write-waits-until-write-done") {
> + poll_write_bo_test(fd, POLLOUT);
> + }
> +
> + igt_subtest("poll-read-waits-until-write-done") {
> + poll_write_bo_test(fd, POLLIN);
> + }
> +
> + igt_fixture
> + close(fd);
> +}
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
