* [igt-dev] [PATCH i-g-t 1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
@ 2020-09-02 0:40 Ashutosh Dixit
2020-09-02 0:40 ` [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite Ashutosh Dixit
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ashutosh Dixit @ 2020-09-02 0:40 UTC (permalink / raw)
To: igt-dev
The general direction at this time is to phase out pread/write ioctls
and not support them in future products. This means IGT must be
modified to handle the absence of pread/write ioctls. This patch does
this as follows:
* __gem_read, gem_read, __gem_write and gem_write calls which are
wrappers around the pread/pwrite ioctls have been renamed to
__gem_pread, gem_pread, __gem_pwrite and gem_pwrite. These will now
only be used where the pread/pwrite ioctls must absolutely be used,
such as tests which test these ioctls or must otherwise only use the
pread/pwrite ioctl's.
* The new gem_read and gem_write function calls are now treated as
general purpose calls to read/write to a gem object. They now try
doing the read/write using the pread/pwrite ioctls first but when
these ioctls are unavailable they fall back to doing the read/write
using a combination of mmap and memcpy.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 165 +++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 9 +-
tests/i915/gem_madvise.c | 3 +-
tests/i915/gem_userptr_blits.c | 4 +-
tests/i915/gen9_exec_parse.c | 6 +-
tests/prime_vgem.c | 14 +--
6 files changed, 181 insertions(+), 20 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..3076b1187 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -323,7 +324,7 @@ void gem_close(int fd, uint32_t handle)
do_ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
}
-int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+int __gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
struct drm_i915_gem_pwrite gem_pwrite;
int err;
@@ -341,7 +342,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -351,12 +352,29 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ igt_assert_eq(__gem_pwrite(fd, handle, offset, buf, length), 0);
}
-int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+/**
+ * gem_has_pwrite
+ * @fd: open i915 drm file descriptor
+ *
+ * Feature test macro to query whether pwrite ioctl is supported
+ */
+bool gem_has_pwrite(int fd)
+{
+ uint32_t handle = gem_create(fd, 4096);
+ int buf, ret;
+
+ ret = __gem_pwrite(fd, handle, 0, &buf, sizeof(buf));
+ gem_close(fd, handle);
+
+ return ret != EOPNOTSUPP;
+}
+
+int __gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
struct drm_i915_gem_pread gem_pread;
int err;
@@ -373,7 +391,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
return err;
}
/**
- * gem_read:
+ * gem_pread:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -383,9 +401,142 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
* This wraps the PREAD ioctl, which is to download a linear data to a subrange
* of a gem buffer object.
*/
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_pread(fd, handle, offset, buf, length), 0);
+}
+
+/**
+ * gem_has_pread
+ * @fd: open i915 drm file descriptor
+ *
+ * Feature test macro to query whether pread ioctl is supported
+ */
+bool gem_has_pread(int fd)
+{
+ uint32_t handle = gem_create(fd, 4096);
+ int buf, ret;
+
+ ret = __gem_pread(fd, handle, 0, &buf, sizeof(buf));
+ gem_close(fd, handle);
+
+ return ret != EOPNOTSUPP;
+}
+
+/**
+ * gem_require_pread_pwrite
+ * @fd: open i915 drm file descriptor
+ *
+ * Feature test macro to query whether pread/pwrite ioctls are supported
+ * and skip if they are not
+ */
+void gem_require_pread_pwrite(int fd)
+{
+ igt_require(gem_has_pread(fd) && gem_has_pwrite(fd));
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ igt_assert(map);
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * General purpose method to write to a gem object. Uses the pwrite ioctl
+ * when it is available, else it uses mmap + memcpy for the write.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ int ret = __gem_pwrite(fd, handle, offset, buf, length);
+
+ igt_assert(ret == 0 || ret == EOPNOTSUPP);
+
+ if (ret == EOPNOTSUPP)
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ igt_assert(map);
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_read:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * General purpose method to read from a gem object. Uses the pread ioctl
+ * when it is available, else it uses mmap + memcpy for the read.
+ */
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ int ret = __gem_pread(fd, handle, offset, buf, length);
+
+ igt_assert(ret == 0 || ret == EOPNOTSUPP);
+
+ if (ret == EOPNOTSUPP)
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 870ac8b7b..d6f8027b7 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -67,9 +67,14 @@ uint32_t gem_get_caching(int fd, uint32_t handle);
uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
-int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+int __gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+bool gem_has_pwrite(int fd);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+int __gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+bool gem_has_pread(int fd);
+void gem_require_pread_pwrite(int fd);
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 54c9befff..c6a4de6a2 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -154,10 +154,11 @@ dontneed_before_pwrite(void)
uint32_t bbe = MI_BATCH_BUFFER_END;
uint32_t handle;
+ gem_require_pread_pwrite(fd);
handle = gem_create(fd, OBJECT_SIZE);
gem_madvise(fd, handle, I915_MADV_DONTNEED);
- igt_assert_eq(__gem_write(fd, handle, 0, &bbe, sizeof(bbe)), -EFAULT);
+ igt_assert_eq(__gem_pwrite(fd, handle, 0, &bbe, sizeof(bbe)), -EFAULT);
close(fd);
}
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index 268423dcd..72b594229 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -890,6 +890,7 @@ static int test_forbidden_ops(int fd)
uint32_t handle;
void *ptr;
+ gem_require_pread_pwrite(fd);
igt_assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE) == 0);
gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags, &handle);
@@ -1416,6 +1417,7 @@ static void test_readonly_pwrite(int i915)
*/
igt_require(igt_setup_clflush());
+ gem_require_pread_pwrite(i915);
sz = 16 << 12;
pages = mmap(NULL, sz, PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
@@ -1429,7 +1431,7 @@ static void test_readonly_pwrite(int i915)
char data[4096];
memset(data, page, sizeof(data));
- igt_assert_eq(__gem_write(i915, handle, page << 12, data, sizeof(data)), -EINVAL);
+ igt_assert_eq(__gem_pwrite(i915, handle, page << 12, data, sizeof(data)), -EINVAL);
}
gem_close(i915, handle);
diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c
index 8cd82f568..ecadb78b5 100644
--- a/tests/i915/gen9_exec_parse.c
+++ b/tests/i915/gen9_exec_parse.c
@@ -670,7 +670,7 @@ static void test_invalid_length(const int i915, const uint32_t handle)
lri_ok, 4096,
0);
- igt_assert_eq(__gem_write(i915, handle, 0, noops, 4097), -EINVAL);
+ igt_assert_eq(__gem_pwrite(i915, handle, 0, noops, 4097), -EINVAL);
}
struct reg {
@@ -1029,8 +1029,10 @@ igt_main
-EINVAL);
}
- igt_subtest("batch-invalid-length")
+ igt_subtest("batch-invalid-length") {
+ gem_require_pread_pwrite(i915);
test_invalid_length(i915, handle);
+ }
igt_subtest("basic-rejected")
test_rejected(i915, handle, false);
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 38e2026aa..b56eb8091 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -48,7 +48,7 @@ static void test_read(int vgem, int i915)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_read(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pread(i915, handle, 0, &i, sizeof(i)),
"PREAD from dma-buf not supported on this hardware\n");
ptr = vgem_mmap(vgem, &scratch, PROT_WRITE);
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -86,7 +86,7 @@ static void test_fence_read(int i915, int vgem)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_read(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pread(i915, handle, 0, &i, sizeof(i)),
"PREAD from dma-buf not supported on this hardware\n");
igt_fork(child, 1) {
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -272,14 +272,14 @@ static void test_write(int vgem, int i915)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_write(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pwrite(i915, handle, 0, &i, sizeof(i)),
"PWRITE to dma-buf not supported on this hardware\n");
ptr = vgem_mmap(vgem, &scratch, PROT_READ);
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite
2020-09-02 0:40 [igt-dev] [PATCH i-g-t 1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Ashutosh Dixit
@ 2020-09-02 0:40 ` Ashutosh Dixit
2020-09-02 4:01 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Patchwork
2020-09-03 11:11 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Ashutosh Dixit @ 2020-09-02 0:40 UTC (permalink / raw)
To: igt-dev
Convert remaining sites to where pread/pwrite ioctl's must absolutely
be used to gem_pread() and gem_pwrite() calls.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
tests/i915/gem_partial_pwrite_pread.c | 9 +++++----
tests/i915/gem_pread.c | 9 +++++----
tests/i915/gem_pwrite.c | 23 ++++++++++++-----------
tests/i915/gem_pwrite_snooped.c | 3 ++-
tests/i915/gem_tiled_pread_basic.c | 3 ++-
tests/i915/gem_tiled_pread_pwrite.c | 5 +++--
6 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/i915/gem_partial_pwrite_pread.c
index b4bae9b6d..906f67e2b 100644
--- a/tests/i915/gem_partial_pwrite_pread.c
+++ b/tests/i915/gem_partial_pwrite_pread.c
@@ -149,7 +149,7 @@ static void test_partial_reads(data_t *data)
blt_bo_fill(data, staging_buf, scratch_buf, val);
get_range(&start, &len);
- gem_read(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pread(data->drm_fd, scratch_buf->handle, start, tmp, len);
for (j = 0; j < len; j++) {
igt_assert_f(tmp[j] == val,
@@ -176,7 +176,7 @@ static void test_partial_writes(data_t *data)
memset(tmp, i + 63, BO_SIZE);
get_range(&start, &len);
- gem_write(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pwrite(data->drm_fd, scratch_buf->handle, start, tmp, len);
copy_bo(scratch_buf, staging_buf);
gtt_ptr = __try_gtt_map_first(data, staging_buf, 0);
@@ -216,7 +216,7 @@ static void test_partial_read_writes(data_t *data)
/* partial read */
get_range(&start, &len);
- gem_read(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pread(data->drm_fd, scratch_buf->handle, start, tmp, len);
for (j = 0; j < len; j++) {
igt_assert_f(tmp[j] == val,
"mismatch in read at %i [%i + %i], got: %i, expected: %i\n",
@@ -232,7 +232,7 @@ static void test_partial_read_writes(data_t *data)
memset(tmp, i + 63, BO_SIZE);
get_range(&start, &len);
- gem_write(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pwrite(data->drm_fd, scratch_buf->handle, start, tmp, len);
copy_bo(scratch_buf, staging_buf);
gtt_ptr = __try_gtt_map_first(data, staging_buf, 0);
@@ -284,6 +284,7 @@ igt_main
data.drm_fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(data.drm_fd);
gem_require_blitter(data.drm_fd);
+ gem_require_pread_pwrite(data.drm_fd);
data.devid = intel_get_drm_devid(data.drm_fd);
data.bops = buf_ops_create(data.drm_fd);
diff --git a/tests/i915/gem_pread.c b/tests/i915/gem_pread.c
index 6d12b8e9f..cb9d1c301 100644
--- a/tests/i915/gem_pread.c
+++ b/tests/i915/gem_pread.c
@@ -63,9 +63,9 @@ static void pread_self(int i915)
uint32_t handle = gem_create(i915, MiB(4));
void *ptr = (*fn)(i915, handle, 0, MiB(4), PROT_WRITE);
- gem_read(i915, handle, 0, ptr + MiB(3), MiB(1));
- gem_read(i915, handle, MiB(3), ptr, MiB(1));
- gem_read(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
+ gem_pread(i915, handle, 0, ptr + MiB(3), MiB(1));
+ gem_pread(i915, handle, MiB(3), ptr, MiB(1));
+ gem_pread(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
munmap(ptr, MiB(4));
gem_close(i915, handle);
@@ -80,7 +80,7 @@ static void pread_self(int i915)
static void do_gem_read(int fd, uint32_t handle, void *buf, int len, int loops)
{
while (loops--)
- gem_read(fd, handle, 0, buf, len);
+ gem_pread(fd, handle, 0, buf, len);
}
static double elapsed(const struct timeval *start,
@@ -149,6 +149,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL)
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
+ gem_require_pread_pwrite(fd);
dst = gem_create(fd, object_size);
src = malloc(object_size);
diff --git a/tests/i915/gem_pwrite.c b/tests/i915/gem_pwrite.c
index e491263fd..3bb1c2d83 100644
--- a/tests/i915/gem_pwrite.c
+++ b/tests/i915/gem_pwrite.c
@@ -66,9 +66,9 @@ static void pwrite_self(int i915)
uint32_t handle = gem_create(i915, MiB(4));
void *ptr = (*fn)(i915, handle, 0, MiB(4), PROT_READ);
- gem_write(i915, handle, 0, ptr + MiB(3), MiB(1));
- gem_write(i915, handle, MiB(3), ptr, MiB(1));
- gem_write(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
+ gem_pwrite(i915, handle, 0, ptr + MiB(3), MiB(1));
+ gem_pwrite(i915, handle, MiB(3), ptr, MiB(1));
+ gem_pwrite(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
munmap(ptr, MiB(4));
gem_close(i915, handle);
@@ -86,7 +86,7 @@ static void pwrite_self(int i915)
static void do_gem_write(int fd, uint32_t handle, void *buf, int len, int loops)
{
while (loops--)
- gem_write(fd, handle, 0, buf, len);
+ gem_pwrite(fd, handle, 0, buf, len);
}
static double elapsed(const struct timeval *start,
@@ -145,8 +145,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)
int suboffset = (offset >> 12) % (4096 - sizeof(offset));
uint64_t tmp;
- gem_write(fd, handle, offset + suboffset, &offset, sizeof(offset));
- gem_read(fd, handle, offset + suboffset, &tmp, sizeof(tmp));
+ gem_pwrite(fd, handle, offset + suboffset, &offset, sizeof(offset));
+ gem_pread(fd, handle, offset + suboffset, &tmp, sizeof(tmp));
igt_assert_eq_u64(offset, tmp);
}
}
@@ -157,8 +157,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)
int suboffset = 4096 - (offset % (4096 - sizeof(offset)));
uint64_t tmp;
- gem_write(fd, handle, (offset<<12) + suboffset, &offset, sizeof(offset));
- gem_read(fd, handle, (offset<<12) + suboffset, &tmp, sizeof(tmp));
+ gem_pwrite(fd, handle, (offset<<12) + suboffset, &offset, sizeof(offset));
+ gem_pread(fd, handle, (offset<<12) + suboffset, &tmp, sizeof(tmp));
igt_assert_eq_u64(offset, tmp);
}
}
@@ -169,8 +169,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)
uint64_t tmp = rand() % (size >> 12);
int suboffset = tmp % (4096 - sizeof(offset));
- gem_write(fd, handle, (tmp << 12) + suboffset, &offset, sizeof(offset));
- gem_read(fd, handle, (tmp << 12) + suboffset, &tmp, sizeof(tmp));
+ gem_pwrite(fd, handle, (tmp << 12) + suboffset, &offset, sizeof(offset));
+ gem_pread(fd, handle, (tmp << 12) + suboffset, &tmp, sizeof(tmp));
igt_assert_eq_u64(offset, tmp);
}
}
@@ -263,7 +263,7 @@ static void test_random(int fd)
uint64_t a = hars_petruska_f54_1_random64(&prng) % (size / sizeof(uint64_t));
uint64_t x = hars_petruska_f54_1_random64(&prng);
- gem_write(fd, handle, a * sizeof(x), &x, sizeof(x));
+ gem_pwrite(fd, handle, a * sizeof(x), &x, sizeof(x));
gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
igt_assert_eq_u64(map[a], x);
@@ -317,6 +317,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL)
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
+ gem_require_pread_pwrite(fd);
dst = gem_create(fd, object_size);
src = malloc(object_size);
diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/i915/gem_pwrite_snooped.c
index 4a3395241..25a9f8830 100644
--- a/tests/i915/gem_pwrite_snooped.c
+++ b/tests/i915/gem_pwrite_snooped.c
@@ -115,7 +115,7 @@ static void test(int w, int h)
gem_set_caching(fd, src->handle, I915_CACHING_CACHED);
- gem_write(fd, src->handle, 0, buf, object_size);
+ gem_pwrite(fd, src->handle, 0, buf, object_size);
gem_set_caching(fd, src->handle, I915_CACHING_NONE);
@@ -132,6 +132,7 @@ igt_simple_main
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
+ gem_require_pread_pwrite(fd);
devid = intel_get_drm_devid(fd);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
diff --git a/tests/i915/gem_tiled_pread_basic.c b/tests/i915/gem_tiled_pread_basic.c
index 7cb644104..8474945f7 100644
--- a/tests/i915/gem_tiled_pread_basic.c
+++ b/tests/i915/gem_tiled_pread_basic.c
@@ -127,6 +127,7 @@ igt_simple_main
igt_require(gem_available_fences(fd) > 0);
handle = create_bo(fd);
igt_require(gem_get_tiling(fd, handle, &tiling, &swizzle));
+ gem_require_pread_pwrite(fd);
devid = intel_get_drm_devid(fd);
@@ -160,7 +161,7 @@ igt_simple_main
len = size;
}
- gem_read(fd, handle, offset, linear, len);
+ gem_pread(fd, handle, offset, linear, len);
/* Translate from offsets in the read buffer to the swizzled
* address that it corresponds to. This is the opposite of
diff --git a/tests/i915/gem_tiled_pread_pwrite.c b/tests/i915/gem_tiled_pread_pwrite.c
index f58048faa..45e172ab2 100644
--- a/tests/i915/gem_tiled_pread_pwrite.c
+++ b/tests/i915/gem_tiled_pread_pwrite.c
@@ -114,6 +114,7 @@ igt_simple_main
fd = drm_open_driver(DRIVER_INTEL);
igt_require(gem_available_fences(fd) > 0);
+ gem_require_pread_pwrite(fd);
count = gem_available_fences(fd) + 1;
intel_require_memory(2 * count, sizeof(linear), CHECK_RAM);
@@ -128,10 +129,10 @@ igt_simple_main
handle = create_bo_and_fill(fd);
igt_require(gem_get_tiling(fd, handle, &tiling, &swizzle));
- gem_read(fd, handle, 0, linear, sizeof(linear));
+ gem_pread(fd, handle, 0, linear, sizeof(linear));
handle_target = create_bo(fd);
- gem_write(fd, handle_target, 0, linear, sizeof(linear));
+ gem_pwrite(fd, handle_target, 0, linear, sizeof(linear));
/* Check the target bo's contents. */
data = gem_mmap__gtt(fd, handle_target, sizeof(linear), PROT_READ);
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
2020-09-02 0:40 [igt-dev] [PATCH i-g-t 1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Ashutosh Dixit
2020-09-02 0:40 ` [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite Ashutosh Dixit
@ 2020-09-02 4:01 ` Patchwork
2020-09-03 11:11 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-09-02 4:01 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 3792 bytes --]
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
URL : https://patchwork.freedesktop.org/series/81245/
State : success
== Summary ==
CI Bug Log - changes from IGT_5776 -> IGTPW_4941
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/index.html
Known issues
------------
Here are the changes found in IGTPW_4941 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parallel@engines@fds:
- fi-kbl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#2398] / [i915#794])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/fi-kbl-guc/igt@gem_exec_parallel@engines@fds.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/fi-kbl-guc/igt@gem_exec_parallel@engines@fds.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
#### Possible fixes ####
* igt@i915_module_load@reload:
- fi-apl-guc: [TIMEOUT][5] ([i915#1418] / [i915#1635]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/fi-apl-guc/igt@i915_module_load@reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/fi-apl-guc/igt@i915_module_load@reload.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-n3050: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/fi-bsw-n3050/igt@i915_pm_rpm@basic-pci-d3-state.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/fi-bsw-n3050/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_pm_rpm@module-reload:
- fi-apl-guc: [SKIP][9] ([fdo#109271] / [i915#1635]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/fi-apl-guc/igt@i915_pm_rpm@module-reload.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/fi-apl-guc/igt@i915_pm_rpm@module-reload.html
* igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1:
- fi-icl-u2: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1418]: https://gitlab.freedesktop.org/drm/intel/issues/1418
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2398]: https://gitlab.freedesktop.org/drm/intel/issues/2398
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794
Participating hosts (38 -> 33)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5776 -> IGTPW_4941
CI-20190529: 20190529
CI_DRM_8951: 5f8c53e35ef01a1d5e97db6005d3c308d3734bac @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4941: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/index.html
IGT_5776: 46e4315096bcaa2465c82c547274627365b1a69e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/index.html
[-- Attachment #1.2: Type: text/html, Size: 4725 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
2020-09-02 0:40 [igt-dev] [PATCH i-g-t 1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Ashutosh Dixit
2020-09-02 0:40 ` [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite Ashutosh Dixit
2020-09-02 4:01 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Patchwork
@ 2020-09-03 11:11 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-09-03 11:11 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 21715 bytes --]
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
URL : https://patchwork.freedesktop.org/series/81245/
State : success
== Summary ==
CI Bug Log - changes from IGT_5776_full -> IGTPW_4941_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/index.html
Known issues
------------
Here are the changes found in IGTPW_4941_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-concurrent0:
- shard-apl: [PASS][1] -> [TIMEOUT][2] ([i915#1635] / [i915#1958]) +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl6/igt@gem_exec_reloc@basic-concurrent0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl6/igt@gem_exec_reloc@basic-concurrent0.html
- shard-kbl: [PASS][3] -> [TIMEOUT][4] ([i915#1958])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl2/igt@gem_exec_reloc@basic-concurrent0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl1/igt@gem_exec_reloc@basic-concurrent0.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-apl: [PASS][5] -> [FAIL][6] ([i915#1635] / [i915#2389])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl1/igt@gem_exec_reloc@basic-many-active@rcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl4/igt@gem_exec_reloc@basic-many-active@rcs0.html
- shard-hsw: [PASS][7] -> [FAIL][8] ([i915#2389])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@gem_exec_reloc@basic-many-active@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw2/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_exec_whisper@basic-contexts-forked:
- shard-glk: [PASS][9] -> [TIMEOUT][10] ([i915#1958]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk6/igt@gem_exec_whisper@basic-contexts-forked.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk4/igt@gem_exec_whisper@basic-contexts-forked.html
* igt@gem_exec_whisper@basic-forked:
- shard-iclb: [PASS][11] -> [TIMEOUT][12] ([i915#1958]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-iclb7/igt@gem_exec_whisper@basic-forked.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-iclb8/igt@gem_exec_whisper@basic-forked.html
* igt@gem_exec_whisper@basic-queues-forked:
- shard-glk: [PASS][13] -> [DMESG-WARN][14] ([i915#118] / [i915#95])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk4/igt@gem_exec_whisper@basic-queues-forked.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk3/igt@gem_exec_whisper@basic-queues-forked.html
* igt@gem_sync@basic-store-all:
- shard-glk: [PASS][15] -> [FAIL][16] ([i915#2356])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk9/igt@gem_sync@basic-store-all.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk1/igt@gem_sync@basic-store-all.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][17] -> [FAIL][18] ([i915#1899])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-iclb3/igt@i915_pm_dc@dc6-psr.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
* igt@kms_cursor_crc@pipe-b-cursor-size-change:
- shard-kbl: [PASS][19] -> [FAIL][20] ([i915#54])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl2/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl2/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
- shard-glk: [PASS][21] -> [FAIL][22] ([i915#54])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk2/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk3/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
- shard-apl: [PASS][23] -> [FAIL][24] ([i915#1635] / [i915#54])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl6/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [PASS][25] -> [FAIL][26] ([i915#96])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size:
- shard-hsw: [PASS][27] -> [FAIL][28] ([i915#2370])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size.html
* igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][29] -> [DMESG-WARN][30] ([i915#1982])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk1/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html
* igt@kms_flip@2x-wf_vblank-ts-check@ab-vga1-hdmi-a1:
- shard-hsw: [PASS][31] -> [DMESG-WARN][32] ([i915#1982])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@kms_flip@2x-wf_vblank-ts-check@ab-vga1-hdmi-a1.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw6/igt@kms_flip@2x-wf_vblank-ts-check@ab-vga1-hdmi-a1.html
* igt@kms_flip@flip-vs-suspend-interruptible@b-hdmi-a1:
- shard-hsw: [PASS][33] -> [INCOMPLETE][34] ([i915#2055])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@kms_flip@flip-vs-suspend-interruptible@b-hdmi-a1.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw2/igt@kms_flip@flip-vs-suspend-interruptible@b-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
- shard-kbl: [PASS][35] -> [DMESG-WARN][36] ([i915#1982]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-wc:
- shard-glk: [PASS][37] -> [FAIL][38] ([i915#49])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-wc.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk3/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen:
- shard-tglb: [PASS][39] -> [DMESG-WARN][40] ([i915#1982]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][41] -> [DMESG-WARN][42] ([i915#180]) +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl1/igt@kms_hdr@bpc-switch-suspend.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl4/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][43] -> [SKIP][44] ([fdo#109642] / [fdo#111068])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-iclb2/igt@kms_psr2_su@page_flip.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-iclb3/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][45] -> [SKIP][46] ([fdo#109441])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-hsw: [PASS][47] -> [FAIL][48] ([i915#31])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@kms_setmode@basic.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw6/igt@kms_setmode@basic.html
#### Possible fixes ####
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][49] ([i915#2389]) -> [PASS][50] +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk7/igt@gem_exec_reloc@basic-many-active@vecs0.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk5/igt@gem_exec_reloc@basic-many-active@vecs0.html
* igt@gem_exec_whisper@basic-fds-forked:
- shard-glk: [TIMEOUT][51] ([i915#1958]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk2/igt@gem_exec_whisper@basic-fds-forked.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk3/igt@gem_exec_whisper@basic-fds-forked.html
* igt@gem_exec_whisper@basic-forked:
- shard-kbl: [TIMEOUT][53] ([i915#1958]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl4/igt@gem_exec_whisper@basic-forked.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl2/igt@gem_exec_whisper@basic-forked.html
* igt@gem_exec_whisper@basic-forked-all:
- shard-glk: [DMESG-WARN][55] ([i915#118] / [i915#95]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk6/igt@gem_exec_whisper@basic-forked-all.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk2/igt@gem_exec_whisper@basic-forked-all.html
* {igt@gem_mmap_offset@blt-coherency}:
- shard-glk: [FAIL][57] ([i915#2328]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk9/igt@gem_mmap_offset@blt-coherency.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk2/igt@gem_mmap_offset@blt-coherency.html
* igt@gem_partial_pwrite_pread@reads-display:
- shard-apl: [FAIL][59] ([i915#1635]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl4/igt@gem_partial_pwrite_pread@reads-display.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl3/igt@gem_partial_pwrite_pread@reads-display.html
* igt@i915_selftest@mock@requests:
- shard-apl: [INCOMPLETE][61] ([i915#1635] / [i915#2278]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl1/igt@i915_selftest@mock@requests.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl7/igt@i915_selftest@mock@requests.html
* igt@i915_suspend@debugfs-reader:
- shard-kbl: [INCOMPLETE][63] ([i915#155]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl2/igt@i915_suspend@debugfs-reader.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl2/igt@i915_suspend@debugfs-reader.html
* igt@kms_big_fb@linear-64bpp-rotate-0:
- shard-glk: [DMESG-FAIL][65] ([i915#118] / [i915#95]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk8/igt@kms_big_fb@linear-64bpp-rotate-0.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk3/igt@kms_big_fb@linear-64bpp-rotate-0.html
* igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen:
- shard-apl: [FAIL][67] ([i915#1635] / [i915#54]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl2/igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen.html
- shard-kbl: [FAIL][69] ([i915#54]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl7/igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen.html
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions:
- shard-hsw: [FAIL][71] ([i915#2370]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][73] ([i915#180]) -> [PASS][74] +7 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl1/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
* igt@kms_flip@plain-flip-fb-recreate@c-dp1:
- shard-kbl: [FAIL][75] ([i915#2122]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-kbl4/igt@kms_flip@plain-flip-fb-recreate@c-dp1.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-kbl2/igt@kms_flip@plain-flip-fb-recreate@c-dp1.html
* igt@kms_frontbuffer_tracking@fbc-badstride:
- shard-glk: [DMESG-WARN][77] ([i915#1982]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-glk2/igt@kms_frontbuffer_tracking@fbc-badstride.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-glk3/igt@kms_frontbuffer_tracking@fbc-badstride.html
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-render:
- shard-tglb: [DMESG-WARN][79] ([i915#1982]) -> [PASS][80] +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-tglb7/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-tglb5/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html
* igt@kms_hdmi_inject@inject-audio:
- shard-tglb: [SKIP][81] ([i915#433]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-tglb1/igt@kms_hdmi_inject@inject-audio.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-tglb7/igt@kms_hdmi_inject@inject-audio.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][83] ([fdo#109441]) -> [PASS][84] +1 similar issue
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-iclb3/igt@kms_psr@psr2_primary_mmap_cpu.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
#### Warnings ####
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: [FAIL][85] ([i915#454]) -> [FAIL][86] ([i915#1899])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-tglb1/igt@i915_pm_dc@dc6-psr.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-tglb1/igt@i915_pm_dc@dc6-psr.html
* igt@kms_content_protection@atomic:
- shard-apl: [FAIL][87] ([fdo#110321] / [fdo#110336] / [i915#1635]) -> [TIMEOUT][88] ([i915#1319] / [i915#1635] / [i915#1958])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl4/igt@kms_content_protection@atomic.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl7/igt@kms_content_protection@atomic.html
* igt@kms_content_protection@lic:
- shard-apl: [TIMEOUT][89] ([i915#1319] / [i915#1635] / [i915#1958]) -> [TIMEOUT][90] ([i915#1319] / [i915#1635])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl3/igt@kms_content_protection@lic.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl8/igt@kms_content_protection@lic.html
* igt@kms_content_protection@srm:
- shard-apl: [TIMEOUT][91] ([i915#1319] / [i915#1635] / [i915#1958]) -> [FAIL][92] ([fdo#110321] / [i915#1635])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl8/igt@kms_content_protection@srm.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl1/igt@kms_content_protection@srm.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][93] ([fdo#109349]) -> [DMESG-WARN][94] ([i915#1226])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-iclb3/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-apl: [FAIL][95] ([fdo#108145] / [i915#1635] / [i915#265]) -> [DMESG-FAIL][96] ([fdo#108145] / [i915#1635] / [i915#1982])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-apl1/igt@kms_plane_alpha_blend@pipe-a-alpha-7efc.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-apl1/igt@kms_plane_alpha_blend@pipe-a-alpha-7efc.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-tglb: [DMESG-WARN][97] ([i915#2411]) -> [INCOMPLETE][98] ([i915#1436] / [i915#1798] / [i915#456]) +1 similar issue
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-tglb5/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-tglb8/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
* igt@kms_vblank@pipe-d-ts-continuation-suspend:
- shard-tglb: [INCOMPLETE][99] ([i915#1436]) -> [DMESG-WARN][100] ([i915#2411])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5776/shard-tglb7/igt@kms_vblank@pipe-d-ts-continuation-suspend.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/shard-tglb1/igt@kms_vblank@pipe-d-ts-continuation-suspend.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1798]: https://gitlab.freedesktop.org/drm/intel/issues/1798
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1899]: https://gitlab.freedesktop.org/drm/intel/issues/1899
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2278]: https://gitlab.freedesktop.org/drm/intel/issues/2278
[i915#2328]: https://gitlab.freedesktop.org/drm/intel/issues/2328
[i915#2356]: https://gitlab.freedesktop.org/drm/intel/issues/2356
[i915#2370]: https://gitlab.freedesktop.org/drm/intel/issues/2370
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (8 -> 8)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5776 -> IGTPW_4941
CI-20190529: 20190529
CI_DRM_8951: 5f8c53e35ef01a1d5e97db6005d3c308d3734bac @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4941: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/index.html
IGT_5776: 46e4315096bcaa2465c82c547274627365b1a69e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4941/index.html
[-- Attachment #1.2: Type: text/html, Size: 26685 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite
2020-09-04 16:20 [igt-dev] [PATCH i-g-t 1/2] " Ashutosh Dixit
@ 2020-09-04 16:20 ` Ashutosh Dixit
0 siblings, 0 replies; 5+ messages in thread
From: Ashutosh Dixit @ 2020-09-04 16:20 UTC (permalink / raw)
To: igt-dev
Convert remaining sites to where pread/pwrite ioctl's must absolutely
be used to gem_pread() and gem_pwrite() calls.
v2: Added some more files missed out in v1
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
tests/i915/gem_partial_pwrite_pread.c | 9 ++++----
tests/i915/gem_pread.c | 9 ++++----
tests/i915/gem_pread_after_blit.c | 1 +
tests/i915/gem_pwrite.c | 23 +++++++++++----------
tests/i915/gem_pwrite_snooped.c | 3 ++-
tests/i915/gem_set_tiling_vs_pwrite.c | 5 +++--
tests/i915/gem_tiled_partial_pwrite_pread.c | 1 +
tests/i915/gem_tiled_pread_basic.c | 3 ++-
tests/i915/gem_tiled_pread_pwrite.c | 5 +++--
9 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/i915/gem_partial_pwrite_pread.c
index b4bae9b6d..906f67e2b 100644
--- a/tests/i915/gem_partial_pwrite_pread.c
+++ b/tests/i915/gem_partial_pwrite_pread.c
@@ -149,7 +149,7 @@ static void test_partial_reads(data_t *data)
blt_bo_fill(data, staging_buf, scratch_buf, val);
get_range(&start, &len);
- gem_read(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pread(data->drm_fd, scratch_buf->handle, start, tmp, len);
for (j = 0; j < len; j++) {
igt_assert_f(tmp[j] == val,
@@ -176,7 +176,7 @@ static void test_partial_writes(data_t *data)
memset(tmp, i + 63, BO_SIZE);
get_range(&start, &len);
- gem_write(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pwrite(data->drm_fd, scratch_buf->handle, start, tmp, len);
copy_bo(scratch_buf, staging_buf);
gtt_ptr = __try_gtt_map_first(data, staging_buf, 0);
@@ -216,7 +216,7 @@ static void test_partial_read_writes(data_t *data)
/* partial read */
get_range(&start, &len);
- gem_read(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pread(data->drm_fd, scratch_buf->handle, start, tmp, len);
for (j = 0; j < len; j++) {
igt_assert_f(tmp[j] == val,
"mismatch in read at %i [%i + %i], got: %i, expected: %i\n",
@@ -232,7 +232,7 @@ static void test_partial_read_writes(data_t *data)
memset(tmp, i + 63, BO_SIZE);
get_range(&start, &len);
- gem_write(data->drm_fd, scratch_buf->handle, start, tmp, len);
+ gem_pwrite(data->drm_fd, scratch_buf->handle, start, tmp, len);
copy_bo(scratch_buf, staging_buf);
gtt_ptr = __try_gtt_map_first(data, staging_buf, 0);
@@ -284,6 +284,7 @@ igt_main
data.drm_fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(data.drm_fd);
gem_require_blitter(data.drm_fd);
+ gem_require_pread_pwrite(data.drm_fd);
data.devid = intel_get_drm_devid(data.drm_fd);
data.bops = buf_ops_create(data.drm_fd);
diff --git a/tests/i915/gem_pread.c b/tests/i915/gem_pread.c
index 6d12b8e9f..cb9d1c301 100644
--- a/tests/i915/gem_pread.c
+++ b/tests/i915/gem_pread.c
@@ -63,9 +63,9 @@ static void pread_self(int i915)
uint32_t handle = gem_create(i915, MiB(4));
void *ptr = (*fn)(i915, handle, 0, MiB(4), PROT_WRITE);
- gem_read(i915, handle, 0, ptr + MiB(3), MiB(1));
- gem_read(i915, handle, MiB(3), ptr, MiB(1));
- gem_read(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
+ gem_pread(i915, handle, 0, ptr + MiB(3), MiB(1));
+ gem_pread(i915, handle, MiB(3), ptr, MiB(1));
+ gem_pread(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
munmap(ptr, MiB(4));
gem_close(i915, handle);
@@ -80,7 +80,7 @@ static void pread_self(int i915)
static void do_gem_read(int fd, uint32_t handle, void *buf, int len, int loops)
{
while (loops--)
- gem_read(fd, handle, 0, buf, len);
+ gem_pread(fd, handle, 0, buf, len);
}
static double elapsed(const struct timeval *start,
@@ -149,6 +149,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL)
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
+ gem_require_pread_pwrite(fd);
dst = gem_create(fd, object_size);
src = malloc(object_size);
diff --git a/tests/i915/gem_pread_after_blit.c b/tests/i915/gem_pread_after_blit.c
index 81454c930..5c99d0887 100644
--- a/tests/i915/gem_pread_after_blit.c
+++ b/tests/i915/gem_pread_after_blit.c
@@ -212,6 +212,7 @@ igt_main
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
+ gem_require_pread_pwrite(fd);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/i915/gem_pwrite.c b/tests/i915/gem_pwrite.c
index e491263fd..3bb1c2d83 100644
--- a/tests/i915/gem_pwrite.c
+++ b/tests/i915/gem_pwrite.c
@@ -66,9 +66,9 @@ static void pwrite_self(int i915)
uint32_t handle = gem_create(i915, MiB(4));
void *ptr = (*fn)(i915, handle, 0, MiB(4), PROT_READ);
- gem_write(i915, handle, 0, ptr + MiB(3), MiB(1));
- gem_write(i915, handle, MiB(3), ptr, MiB(1));
- gem_write(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
+ gem_pwrite(i915, handle, 0, ptr + MiB(3), MiB(1));
+ gem_pwrite(i915, handle, MiB(3), ptr, MiB(1));
+ gem_pwrite(i915, handle, MiB(1), ptr + MiB(1), MiB(2));
munmap(ptr, MiB(4));
gem_close(i915, handle);
@@ -86,7 +86,7 @@ static void pwrite_self(int i915)
static void do_gem_write(int fd, uint32_t handle, void *buf, int len, int loops)
{
while (loops--)
- gem_write(fd, handle, 0, buf, len);
+ gem_pwrite(fd, handle, 0, buf, len);
}
static double elapsed(const struct timeval *start,
@@ -145,8 +145,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)
int suboffset = (offset >> 12) % (4096 - sizeof(offset));
uint64_t tmp;
- gem_write(fd, handle, offset + suboffset, &offset, sizeof(offset));
- gem_read(fd, handle, offset + suboffset, &tmp, sizeof(tmp));
+ gem_pwrite(fd, handle, offset + suboffset, &offset, sizeof(offset));
+ gem_pread(fd, handle, offset + suboffset, &tmp, sizeof(tmp));
igt_assert_eq_u64(offset, tmp);
}
}
@@ -157,8 +157,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)
int suboffset = 4096 - (offset % (4096 - sizeof(offset)));
uint64_t tmp;
- gem_write(fd, handle, (offset<<12) + suboffset, &offset, sizeof(offset));
- gem_read(fd, handle, (offset<<12) + suboffset, &tmp, sizeof(tmp));
+ gem_pwrite(fd, handle, (offset<<12) + suboffset, &offset, sizeof(offset));
+ gem_pread(fd, handle, (offset<<12) + suboffset, &tmp, sizeof(tmp));
igt_assert_eq_u64(offset, tmp);
}
}
@@ -169,8 +169,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)
uint64_t tmp = rand() % (size >> 12);
int suboffset = tmp % (4096 - sizeof(offset));
- gem_write(fd, handle, (tmp << 12) + suboffset, &offset, sizeof(offset));
- gem_read(fd, handle, (tmp << 12) + suboffset, &tmp, sizeof(tmp));
+ gem_pwrite(fd, handle, (tmp << 12) + suboffset, &offset, sizeof(offset));
+ gem_pread(fd, handle, (tmp << 12) + suboffset, &tmp, sizeof(tmp));
igt_assert_eq_u64(offset, tmp);
}
}
@@ -263,7 +263,7 @@ static void test_random(int fd)
uint64_t a = hars_petruska_f54_1_random64(&prng) % (size / sizeof(uint64_t));
uint64_t x = hars_petruska_f54_1_random64(&prng);
- gem_write(fd, handle, a * sizeof(x), &x, sizeof(x));
+ gem_pwrite(fd, handle, a * sizeof(x), &x, sizeof(x));
gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
igt_assert_eq_u64(map[a], x);
@@ -317,6 +317,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL)
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
+ gem_require_pread_pwrite(fd);
dst = gem_create(fd, object_size);
src = malloc(object_size);
diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/i915/gem_pwrite_snooped.c
index 4a3395241..25a9f8830 100644
--- a/tests/i915/gem_pwrite_snooped.c
+++ b/tests/i915/gem_pwrite_snooped.c
@@ -115,7 +115,7 @@ static void test(int w, int h)
gem_set_caching(fd, src->handle, I915_CACHING_CACHED);
- gem_write(fd, src->handle, 0, buf, object_size);
+ gem_pwrite(fd, src->handle, 0, buf, object_size);
gem_set_caching(fd, src->handle, I915_CACHING_NONE);
@@ -132,6 +132,7 @@ igt_simple_main
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
+ gem_require_pread_pwrite(fd);
devid = intel_get_drm_devid(fd);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
diff --git a/tests/i915/gem_set_tiling_vs_pwrite.c b/tests/i915/gem_set_tiling_vs_pwrite.c
index 302ea24b6..dd2c7aeb9 100644
--- a/tests/i915/gem_set_tiling_vs_pwrite.c
+++ b/tests/i915/gem_set_tiling_vs_pwrite.c
@@ -55,6 +55,7 @@ igt_simple_main
fd = drm_open_driver(DRIVER_INTEL);
igt_require(gem_available_fences(fd) > 0);
+ gem_require_pread_pwrite(fd);
for (int i = 0; i < OBJECT_SIZE/4; i++)
data[i] = i;
@@ -72,7 +73,7 @@ igt_simple_main
}
igt_info("testing pwrite on tiled buffer\n");
- gem_write(fd, handle, 0, data, OBJECT_SIZE);
+ gem_pwrite(fd, handle, 0, data, OBJECT_SIZE);
memset(data, 0, OBJECT_SIZE);
gem_read(fd, handle, 0, data, OBJECT_SIZE);
for (int i = 0; i < OBJECT_SIZE/4; i++)
@@ -88,7 +89,7 @@ igt_simple_main
gem_set_tiling(fd, handle, I915_TILING_NONE, 0);
igt_info("testing pwrite on untiled, but still fenced buffer\n");
- gem_write(fd, handle, 0, data, OBJECT_SIZE);
+ gem_pwrite(fd, handle, 0, data, OBJECT_SIZE);
memset(data, 0, OBJECT_SIZE);
gem_read(fd, handle, 0, data, OBJECT_SIZE);
for (int i = 0; i < OBJECT_SIZE/4; i++)
diff --git a/tests/i915/gem_tiled_partial_pwrite_pread.c b/tests/i915/gem_tiled_partial_pwrite_pread.c
index 7de5358b2..0c4545990 100644
--- a/tests/i915/gem_tiled_partial_pwrite_pread.c
+++ b/tests/i915/gem_tiled_partial_pwrite_pread.c
@@ -270,6 +270,7 @@ igt_main
igt_require_gem(fd);
gem_require_mappable_ggtt(fd);
gem_require_blitter(fd);
+ gem_require_pread_pwrite(fd);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
//drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/i915/gem_tiled_pread_basic.c b/tests/i915/gem_tiled_pread_basic.c
index 7cb644104..8474945f7 100644
--- a/tests/i915/gem_tiled_pread_basic.c
+++ b/tests/i915/gem_tiled_pread_basic.c
@@ -127,6 +127,7 @@ igt_simple_main
igt_require(gem_available_fences(fd) > 0);
handle = create_bo(fd);
igt_require(gem_get_tiling(fd, handle, &tiling, &swizzle));
+ gem_require_pread_pwrite(fd);
devid = intel_get_drm_devid(fd);
@@ -160,7 +161,7 @@ igt_simple_main
len = size;
}
- gem_read(fd, handle, offset, linear, len);
+ gem_pread(fd, handle, offset, linear, len);
/* Translate from offsets in the read buffer to the swizzled
* address that it corresponds to. This is the opposite of
diff --git a/tests/i915/gem_tiled_pread_pwrite.c b/tests/i915/gem_tiled_pread_pwrite.c
index f58048faa..45e172ab2 100644
--- a/tests/i915/gem_tiled_pread_pwrite.c
+++ b/tests/i915/gem_tiled_pread_pwrite.c
@@ -114,6 +114,7 @@ igt_simple_main
fd = drm_open_driver(DRIVER_INTEL);
igt_require(gem_available_fences(fd) > 0);
+ gem_require_pread_pwrite(fd);
count = gem_available_fences(fd) + 1;
intel_require_memory(2 * count, sizeof(linear), CHECK_RAM);
@@ -128,10 +129,10 @@ igt_simple_main
handle = create_bo_and_fill(fd);
igt_require(gem_get_tiling(fd, handle, &tiling, &swizzle));
- gem_read(fd, handle, 0, linear, sizeof(linear));
+ gem_pread(fd, handle, 0, linear, sizeof(linear));
handle_target = create_bo(fd);
- gem_write(fd, handle_target, 0, linear, sizeof(linear));
+ gem_pwrite(fd, handle_target, 0, linear, sizeof(linear));
/* Check the target bo's contents. */
data = gem_mmap__gtt(fd, handle_target, sizeof(linear), PROT_READ);
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-04 19:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02 0:40 [igt-dev] [PATCH i-g-t 1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Ashutosh Dixit
2020-09-02 0:40 ` [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite Ashutosh Dixit
2020-09-02 4:01 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls Patchwork
2020-09-03 11:11 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2020-09-04 16:20 [igt-dev] [PATCH i-g-t 1/2] " Ashutosh Dixit
2020-09-04 16:20 ` [igt-dev] [PATCH i-g-t 2/2] tests/i915: Convert remaining sites to gem_pread/gem_pwrite Ashutosh Dixit
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.