This just checks that the appropriate errors get thrown, and that the
modifier can be set/get successfully, and that the modifier doesn't
leak to other BO allocations. Testing of scanout will be done with
the writeback support that Boris is building. The modifier has no
effect on V3D rendering, so no need to test that.
Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
---
lib/igt_vc4.c | 21 ++++++++
lib/igt_vc4.h | 3 ++
tests/Makefile.am | 2 +
tests/Makefile.sources | 1 +
tests/vc4_tiling.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 164 insertions(+)
create mode 100644 tests/vc4_tiling.c
diff --git a/lib/igt_vc4.c b/lib/igt_vc4.c
index c4682f5688f1..5347af8df400 100644
--- a/lib/igt_vc4.c
+++ b/lib/igt_vc4.c
@@ -128,3 +128,24 @@ igt_vc4_mmap_bo(int fd, uint32_t handle, uint32_t size, unsigned prot)
else
return ptr;
}
+
+void igt_vc4_set_tiling(int fd, uint32_t handle, uint64_t modifier)
+{
+ struct drm_vc4_set_tiling set = {
+ .handle = handle,
+ .modifier = modifier,
+ };
+
+ do_ioctl(fd, DRM_IOCTL_VC4_SET_TILING, &set);
+}
+
+uint64_t igt_vc4_get_tiling(int fd, uint32_t handle)
+{
+ struct drm_vc4_get_tiling get = {
+ .handle = handle,
+ };
+
+ do_ioctl(fd, DRM_IOCTL_VC4_GET_TILING, &get);
+
+ return get.modifier;
+}
diff --git a/lib/igt_vc4.h b/lib/igt_vc4.h
index e9252461c951..d1740b93f1fc 100644
--- a/lib/igt_vc4.h
+++ b/lib/igt_vc4.h
@@ -28,4 +28,7 @@ uint32_t igt_vc4_get_cleared_bo(int fd, size_t size, uint32_t clearval);
int igt_vc4_create_bo(int fd, size_t size);
void *igt_vc4_mmap_bo(int fd, uint32_t handle, uint32_t size, unsigned prot);
+void igt_vc4_set_tiling(int fd, uint32_t handle, uint64_t modifier);
+uint64_t igt_vc4_get_tiling(int fd, uint32_t handle);
+
#endif /* IGT_VC4_H */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 12cc6dc48c12..0de12e204080 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -126,6 +126,8 @@ 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_tiling_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
+vc4_tiling_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 b3a680e9d75e..6d3c539b4041 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -8,6 +8,7 @@ VC4_TESTS_M = \
vc4_create_bo \
vc4_dmabuf_poll \
vc4_lookup_fail \
+ vc4_tiling \
vc4_wait_bo \
vc4_wait_seqno \
$(NULL)
diff --git a/tests/vc4_tiling.c b/tests/vc4_tiling.c
new file mode 100644
index 000000000000..00c7c6b84d60
--- /dev/null
+++ b/tests/vc4_tiling.c
@@ -0,0 +1,137 @@
+/*
+ * 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"
+
+igt_main
+{
+ int fd;
+
+ igt_fixture
+ fd = drm_open_driver(DRIVER_VC4);
+
+ igt_subtest("get-bad-handle") {
+ struct drm_vc4_get_tiling get = {
+ .handle = 0xd0d0d0d0,
+ };
+ do_ioctl_err(fd, DRM_IOCTL_VC4_GET_TILING, &get, ENOENT);
+ }
+
+ igt_subtest("set-bad-handle") {
+ struct drm_vc4_set_tiling set = {
+ .handle = 0xd0d0d0d0,
+ .modifier = DRM_FORMAT_MOD_NONE,
+ };
+ do_ioctl_err(fd, DRM_IOCTL_VC4_SET_TILING, &set, ENOENT);
+ }
+
+ igt_subtest("get-bad-flags") {
+ int bo = igt_vc4_create_bo(fd, 4096);
+ struct drm_vc4_get_tiling get = {
+ .handle = bo,
+ .flags = 0xd0d0d0d0,
+ };
+ do_ioctl_err(fd, DRM_IOCTL_VC4_GET_TILING, &get, EINVAL);
+ gem_close(fd, bo);
+ }
+
+ igt_subtest("set-bad-flags") {
+ int bo = igt_vc4_create_bo(fd, 4096);
+ struct drm_vc4_set_tiling set = {
+ .handle = bo,
+ .flags = 0xd0d0d0d0,
+ .modifier = DRM_FORMAT_MOD_NONE,
+ };
+ do_ioctl_err(fd, DRM_IOCTL_VC4_SET_TILING, &set, EINVAL);
+ gem_close(fd, bo);
+ }
+
+ igt_subtest("get-bad-modifier") {
+ int bo = igt_vc4_create_bo(fd, 4096);
+ struct drm_vc4_get_tiling get = {
+ .handle = bo,
+ .modifier = 0xd0d0d0d0,
+ };
+ do_ioctl_err(fd, DRM_IOCTL_VC4_GET_TILING, &get, EINVAL);
+ gem_close(fd, bo);
+ }
+
+ igt_subtest("set-bad-modifier") {
+ int bo = igt_vc4_create_bo(fd, 4096);
+ struct drm_vc4_set_tiling set = {
+ .handle = bo,
+ .modifier = 0xd0d0d0d0,
+ };
+ do_ioctl_err(fd, DRM_IOCTL_VC4_SET_TILING, &set, EINVAL);
+ gem_close(fd, bo);
+ }
+
+ igt_subtest("set-get") {
+ int bo = igt_vc4_create_bo(fd, 4096);
+
+ /* Default is untiled. */
+ igt_assert(igt_vc4_get_tiling(fd, bo) == DRM_FORMAT_MOD_NONE);
+
+ /* Set to tiled and check. */
+ igt_vc4_set_tiling(fd, bo, DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED);
+ igt_assert(igt_vc4_get_tiling(fd, bo) ==
+ DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED);
+
+ /* Set it back and check. */
+ igt_vc4_set_tiling(fd, bo, DRM_FORMAT_MOD_NONE);
+ igt_assert(igt_vc4_get_tiling(fd, bo) == DRM_FORMAT_MOD_NONE);
+
+ gem_close(fd, bo);
+ }
+
+ igt_subtest("get-after-free") {
+ /* Some size that probably nobody else is using, to
+ * encourage getting the same BO back from the cache.
+ */
+ int size = 91 * 4096;
+ int bo;
+
+ bo = igt_vc4_create_bo(fd, size);
+ igt_vc4_set_tiling(fd, bo, DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED);
+ gem_close(fd, bo);
+
+ bo = igt_vc4_create_bo(fd, size);
+ igt_assert(igt_vc4_get_tiling(fd, bo) == DRM_FORMAT_MOD_NONE);
+ gem_close(fd, bo);
+ }
+
+ igt_fixture
+ close(fd);
+}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
