lib/drmtest: extract gem_write

Astonishing how many different function signatures are possible for
something that simple.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

19 files changed, 29 insertions, 252 deletions

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 6bf57c1f..d6e2540e 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -142,3 +142,17 @@ void gem_close(int fd, uint32_t handle)
 	ret = drmIoctl(fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
 	assert(ret == 0);
 }
+
+void gem_write(int fd, uint32_t handle, uint32_t offset, const void *buf, uint32_t size)
+{
+	struct drm_i915_gem_pwrite gem_pwrite;
+	int ret;
+
+	gem_pwrite.handle = handle;
+	gem_pwrite.offset = offset;
+	gem_pwrite.size = size;
+	gem_pwrite.data_ptr = (uintptr_t)buf;
+	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &gem_pwrite);
+	assert(ret == 0);
+}
+
diff --git a/lib/drmtest.h b/lib/drmtest.h
index c2aaaeef..0e8e4757 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -39,3 +39,4 @@ int drm_open_any_master(void);
 
 void gem_set_tiling(int fd, uint32_t handle, int tiling, int stride);
 void gem_close(int fd, uint32_t handle);
+void gem_write(int fd, uint32_t handle, uint32_t offset,  const void *buf, uint32_t size);
diff --git a/tests/gem_bad_length.c b/tests/gem_bad_length.c
index 167128d5..2cc5187b 100644
--- a/tests/gem_bad_length.c
+++ b/tests/gem_bad_length.c
@@ -64,22 +64,6 @@ static uint32_t gem_create(int fd, int size, int *retval)
 	return create.handle;
 }
 
-static void gem_write(int fd,
-		      uint32_t handle, uint32_t offset,
-		      const void *src, int length)
-{
-	struct drm_i915_gem_pwrite arg;
-	int ret;
-
-	arg.handle = handle;
-	arg.offset = offset;
-	arg.size = length;
-	arg.data_ptr = (uintptr_t)src;
-
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &arg);
-	assert(ret == 0);
-}
-
 static int gem_exec(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
 {
 	return drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf);
diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c
index c1350e96..415b8826 100644
--- a/tests/gem_exec_blt.c
+++ b/tests/gem_exec_blt.c
@@ -63,19 +63,6 @@ static uint32_t gem_create(int fd, int size)
 	return create.handle;
 }
 
-static int gem_write(int fd,
-		     uint32_t handle, uint32_t offset,
-		     const void *src, int length)
-{
-	struct drm_i915_gem_pwrite pwrite;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = length;
-	pwrite.data_ptr = (uintptr_t)src;
-	return drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-}
-
 static int gem_linear_blt(uint32_t *batch,
 			  uint32_t src,
 			  uint32_t dst,
diff --git a/tests/gem_exec_faulting_reloc.c b/tests/gem_exec_faulting_reloc.c
index be845107..fec3a473 100644
--- a/tests/gem_exec_faulting_reloc.c
+++ b/tests/gem_exec_faulting_reloc.c
@@ -88,19 +88,6 @@ static uint32_t gem_create(int fd, int size)
 	return create.handle;
 }
 
-static int gem_write(int fd,
-		     uint32_t handle, uint32_t offset,
-		     const void *src, int length)
-{
-	struct drm_i915_gem_pwrite pwrite;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = length;
-	pwrite.data_ptr = (uintptr_t)src;
-	return drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-}
-
 static int gem_linear_blt(uint32_t *batch,
 			  uint32_t src,
 			  uint32_t dst,
@@ -234,8 +221,7 @@ static void run(int object_size)
 	exec[1].rsvd2 = 0;
 
 	handle_relocs = gem_create(fd, 4096);
-	ret = gem_write(fd, handle_relocs, 0, reloc, sizeof(reloc));
-	assert(ret == 0);
+	gem_write(fd, handle_relocs, 0, reloc, sizeof(reloc));
 	gtt_relocs = mmap_bo(fd, handle_relocs);
 	assert(gtt_relocs);
 
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index 583d1a52..7bfe37fc 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -55,19 +55,6 @@ static uint32_t gem_create(int fd, int size)
 	return create.handle;
 }
 
-static int gem_write(int fd,
-		     uint32_t handle, uint32_t offset,
-		     const void *src, int length)
-{
-	struct drm_i915_gem_pwrite pwrite;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = length;
-	pwrite.data_ptr = (uintptr_t)src;
-	return drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-}
-
 static void gem_sync(int fd, uint32_t handle)
 {
 	struct drm_i915_gem_set_domain set_domain;
diff --git a/tests/gem_gtt_speed.c b/tests/gem_gtt_speed.c
index 6bb229c4..959a16ae 100644
--- a/tests/gem_gtt_speed.c
+++ b/tests/gem_gtt_speed.c
@@ -72,19 +72,6 @@ static void *gem_mmap(int fd, uint32_t handle, int size, int prot)
 	return ptr;
 }
 
-static int gem_write(int fd,
-		     uint32_t handle, uint32_t offset,
-		     const void *src, int length)
-{
-	struct drm_i915_gem_pwrite pwrite;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = length;
-	pwrite.data_ptr = (uintptr_t)src;
-	return drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-}
-
 static int gem_read(int fd,
 		    uint32_t handle, uint32_t offset,
 		    const void *src, int length)
diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c
index 9bdf2e1b..4e27d92c 100644
--- a/tests/gem_linear_blits.c
+++ b/tests/gem_linear_blits.c
@@ -77,20 +77,6 @@ gem_aperture_size(int fd)
 }
 
 static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
-static void
 gem_read(int fd, uint32_t handle, int offset, int size, void *buf)
 {
 	struct drm_i915_gem_pread pread;
@@ -130,7 +116,7 @@ copy(int fd, uint32_t dst, uint32_t src)
 	batch[9] = MI_NOOP;
 
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, sizeof(batch), batch);
+	gem_write(fd, handle, 0, batch, sizeof(batch));
 
 	reloc[0].target_handle = dst;
 	reloc[0].delta = 0;
@@ -203,7 +189,7 @@ create_bo(int fd, uint32_t val)
 	/* Fill the BO with dwords starting at val */
 	for (i = 0; i < WIDTH*HEIGHT; i++)
 		linear[i] = val++;
-	gem_write(fd, handle, 0, sizeof(linear), linear);
+	gem_write(fd, handle, 0, linear, sizeof(linear));
 
 	return handle;
 }
diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
index 32b7861c..5730f7ec 100644
--- a/tests/gem_mmap.c
+++ b/tests/gem_mmap.c
@@ -42,20 +42,6 @@
 
 #define OBJECT_SIZE 16384
 
-static int
-do_write(int fd, int handle, void *buf, int offset, int size)
-{
-	struct drm_i915_gem_pwrite write;
-
-	memset(&write, 0, sizeof(write));
-	write.handle = handle;
-	write.data_ptr = (uintptr_t)buf;
-	write.size = size;
-	write.offset = offset;
-
-	return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &write);
-}
-
 int main(int argc, char **argv)
 {
 	int fd;
@@ -100,8 +86,7 @@ int main(int argc, char **argv)
 	memset(buf, 0, sizeof(buf));
 	memset(buf + 1024, 0x01, 1024);
 	memset(expected + 1024, 0x01, 1024);
-	ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
-	assert(ret == 0);
+	gem_write(fd, handle, 0, buf, OBJECT_SIZE);
 	assert(memcmp(buf, addr, sizeof(buf)) == 0);
 
 	printf("Testing that mapping stays after close\n");
diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c
index 35e388f5..32992437 100644
--- a/tests/gem_mmap_gtt.c
+++ b/tests/gem_mmap_gtt.c
@@ -55,22 +55,6 @@ static uint32_t gem_create(int fd, int size)
 	return create.handle;
 }
 
-static void gem_write(int fd,
-		      uint32_t handle, uint32_t offset,
-		      const void *src, int length)
-{
-	struct drm_i915_gem_pwrite arg;
-	int ret;
-
-	arg.handle = handle;
-	arg.offset = offset;
-	arg.size = length;
-	arg.data_ptr = (uintptr_t)src;
-
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &arg);
-	assert(ret == 0);
-}
-
 static void gem_read(int fd,
 		     uint32_t handle, uint32_t offset,
 		     void *dst, int length)
diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c
index a1a57bd3..a79e985e 100644
--- a/tests/gem_pwrite.c
+++ b/tests/gem_pwrite.c
@@ -62,19 +62,6 @@ static uint32_t gem_create(int fd, int size)
 	return create.handle;
 }
 
-static int gem_write(int fd,
-		     uint32_t handle, uint32_t offset,
-		     const void *src, int length)
-{
-	struct drm_i915_gem_pwrite pwrite;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = length;
-	pwrite.data_ptr = (uintptr_t)src;
-	return drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-}
-
 static void do_gem_write(int fd, uint32_t handle, void *buf, int len, int loops)
 {
 	while (loops--)
diff --git a/tests/gem_tiled_fence_blits.c b/tests/gem_tiled_fence_blits.c
index 6d53bcd1..d2ed0ed8 100644
--- a/tests/gem_tiled_fence_blits.c
+++ b/tests/gem_tiled_fence_blits.c
@@ -73,20 +73,6 @@ gem_aperture_size(int fd)
 }
 
 static void
-gem_write(int fd, drm_intel_bo *bo, const void *buf, int size)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = bo->handle;
-	pwrite.offset = 0;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
-static void
 gem_read(int fd, drm_intel_bo *bo, void *buf, int size)
 {
 	struct drm_i915_gem_pread pread;
@@ -116,7 +102,7 @@ create_bo(int fd, uint32_t start_val)
 	for (i = 0; i < 1024 * 1024 / 4; i++)
 		linear[i] = start_val++;
 
-	gem_write(fd, bo, linear, sizeof(linear));
+	gem_write(fd, bo->handle, 0, linear, sizeof(linear));
 
 	return bo;
 }
diff --git a/tests/gem_tiled_pread_pwrite.c b/tests/gem_tiled_pread_pwrite.c
index b10eaa49..74e230e5 100644
--- a/tests/gem_tiled_pread_pwrite.c
+++ b/tests/gem_tiled_pread_pwrite.c
@@ -95,19 +95,6 @@ static void *gem_mmap(int fd, uint32_t handle, int size, int prot)
 	return ptr;
 }
 
-static int gem_write(int fd,
-		     uint32_t handle, uint32_t offset,
-		     const void *src, int length)
-{
-	struct drm_i915_gem_pwrite pwrite;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = length;
-	pwrite.data_ptr = (uintptr_t)src;
-	return drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-}
-
 static void
 gem_read(int fd, uint32_t handle, int offset, int length, void *buf)
 {
diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
index 72be1636..f2fe4ea1 100644
--- a/tests/gem_vmap_blits.c
+++ b/tests/gem_vmap_blits.c
@@ -118,20 +118,6 @@ gem_aperture_size(int fd)
 }
 
 static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
-static void
 gem_read(int fd, uint32_t handle, int offset, int size, void *buf)
 {
 	struct drm_i915_gem_pread pread;
@@ -171,7 +157,7 @@ copy(int fd, uint32_t dst, uint32_t src)
 	batch[9] = MI_NOOP;
 
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, sizeof(batch), batch);
+	gem_write(fd, handle, 0, batch, sizeof(batch));
 
 	reloc[0].target_handle = dst;
 	reloc[0].delta = 0;
@@ -259,7 +245,7 @@ create_bo(int fd, uint32_t val)
 	/* Fill the BO with dwords starting at val */
 	for (i = 0; i < WIDTH*HEIGHT; i++)
 		linear[i] = val++;
-	gem_write(fd, handle, 0, sizeof(linear), linear);
+	gem_write(fd, handle, 0, linear, sizeof(linear));
 
 	return handle;
 }
diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
index 4f868201..637b8a22 100644
--- a/tests/gen3_mixed_blits.c
+++ b/tests/gen3_mixed_blits.c
@@ -87,20 +87,6 @@ gem_aperture_size(int fd)
 	return aperture.aper_size;
 }
 
-static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
 static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
 			   uint32_t offset,
 			   uint32_t handle,
@@ -306,7 +292,7 @@ render_copy(int fd,
 
 	assert(b - batch <= 1024);
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, (b-batch)*sizeof(batch[0]), batch);
+	gem_write(fd, handle, 0, batch, (b-batch)*sizeof(batch[0]));
 
 	assert(r-reloc == 2);
 
@@ -387,7 +373,7 @@ static void blt_copy(int fd, uint32_t dst, uint32_t src)
 
 	assert(b - batch <= 1024);
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, (b-batch)*sizeof(batch[0]), batch);
+	gem_write(fd, handle, 0, batch, (b-batch)*sizeof(batch[0]));
 
 	assert(r-reloc == 2);
 
diff --git a/tests/gen3_render_linear_blits.c b/tests/gen3_render_linear_blits.c
index 209029f4..79fe9d0a 100644
--- a/tests/gen3_render_linear_blits.c
+++ b/tests/gen3_render_linear_blits.c
@@ -88,20 +88,6 @@ gem_aperture_size(int fd)
 }
 
 static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
-static void
 gem_read(int fd, uint32_t handle, int offset, int size, void *buf)
 {
 	struct drm_i915_gem_pread pread;
@@ -293,7 +279,7 @@ copy(int fd, uint32_t dst, uint32_t src)
 
 	assert(b - batch <= 1024);
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, (b-batch)*sizeof(batch[0]), batch);
+	gem_write(fd, handle, 0, batch, (b-batch)*sizeof(batch[0]));
 
 	assert(r-reloc == 2);
 
@@ -354,7 +340,7 @@ create_bo(int fd, uint32_t val)
 	/* Fill the BO with dwords starting at val */
 	for (i = 0; i < WIDTH*HEIGHT; i++)
 		linear[i] = val++;
-	gem_write(fd, handle, 0, sizeof(linear), linear);
+	gem_write(fd, handle, 0, linear, sizeof(linear));
 
 	return handle;
 }
diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c
index 9be93f0b..c0160e67 100644
--- a/tests/gen3_render_mixed_blits.c
+++ b/tests/gen3_render_mixed_blits.c
@@ -87,20 +87,6 @@ gem_aperture_size(int fd)
 	return aperture.aper_size;
 }
 
-static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
 static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
 			   uint32_t offset,
 			   uint32_t handle,
@@ -293,7 +279,7 @@ copy(int fd,
 
 	assert(b - batch <= 1024);
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, (b-batch)*sizeof(batch[0]), batch);
+	gem_write(fd, handle, 0, batch, (b-batch)*sizeof(batch[0]));
 
 	assert(r-reloc == 2);
 
diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c
index 5c4f1392..b39c1d1b 100644
--- a/tests/gen3_render_tiledx_blits.c
+++ b/tests/gen3_render_tiledx_blits.c
@@ -87,20 +87,6 @@ gem_aperture_size(int fd)
 	return aperture.aper_size;
 }
 
-static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
 static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
 			   uint32_t offset,
 			   uint32_t handle,
@@ -280,7 +266,7 @@ copy(int fd, uint32_t dst, uint32_t src)
 
 	assert(b - batch <= 1024);
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, (b-batch)*sizeof(batch[0]), batch);
+	gem_write(fd, handle, 0, batch, (b-batch)*sizeof(batch[0]));
 
 	assert(r-reloc == 2);
 
diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c
index 47625b3f..0a71dee6 100644
--- a/tests/gen3_render_tiledy_blits.c
+++ b/tests/gen3_render_tiledy_blits.c
@@ -87,20 +87,6 @@ gem_aperture_size(int fd)
 	return aperture.aper_size;
 }
 
-static void
-gem_write(int fd, uint32_t handle, int offset, int size, const void *buf)
-{
-	struct drm_i915_gem_pwrite pwrite;
-	int ret;
-
-	pwrite.handle = handle;
-	pwrite.offset = offset;
-	pwrite.size = size;
-	pwrite.data_ptr = (uintptr_t)buf;
-	ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
-	assert(ret == 0);
-}
-
 static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
 			   uint32_t offset,
 			   uint32_t handle,
@@ -280,7 +266,7 @@ copy(int fd, uint32_t dst, uint32_t src)
 
 	assert(b - batch <= 1024);
 	handle = gem_create(fd, 4096);
-	gem_write(fd, handle, 0, (b-batch)*sizeof(batch[0]), batch);
+	gem_write(fd, handle, 0, batch, (b-batch)*sizeof(batch[0]));
 
 	assert(r-reloc == 2);