summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/drmtest.c9
-rw-r--r--lib/drmtest.h1
-rw-r--r--tests/gem_largeobject.c10
-rw-r--r--tests/gem_linear_blits.c10
-rw-r--r--tests/gem_stress.c9
-rw-r--r--tests/gem_tiled_blits.c10
-rw-r--r--tests/gem_tiled_fence_blits.c10
-rw-r--r--tests/gem_vmap_blits.c10
-rw-r--r--tests/gen3_mixed_blits.c10
-rw-r--r--tests/gen3_render_linear_blits.c10
-rw-r--r--tests/gen3_render_mixed_blits.c10
-rw-r--r--tests/gen3_render_tiledx_blits.c10
-rw-r--r--tests/gen3_render_tiledy_blits.c10
13 files changed, 10 insertions, 109 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c
index a64aa6aa..6ee602cd 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -265,6 +265,15 @@ void *gem_mmap(int fd, uint32_t handle, int size, int prot)
return ptr;
}
+uint64_t gem_aperture_size(int fd)
+{
+ struct drm_i915_gem_get_aperture aperture;
+
+ aperture.aper_size = 256*1024*1024;
+ (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+ return aperture.aper_size;
+}
+
static pid_t signal_helper = -1;
long long int sig_stat;
static void signal_helper_process(pid_t pid)
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 4af98002..9b0e6483 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -47,6 +47,7 @@ void gem_set_domain(int fd, uint32_t handle,
void gem_sync(int fd, uint32_t handle);
uint32_t gem_create(int fd, int size);
void *gem_mmap(int fd, uint32_t handle, int size, int prot);
+uint64_t gem_aperture_size(int fd);
void drmtest_fork_signal_helper(void);
void drmtest_stop_signal_helper(void);
diff --git a/tests/gem_largeobject.c b/tests/gem_largeobject.c
index 721a1742..163bf101 100644
--- a/tests/gem_largeobject.c
+++ b/tests/gem_largeobject.c
@@ -43,16 +43,6 @@
unsigned char data[OBJ_SIZE];
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static void
test_large_object(int fd)
{
diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c
index fedc670b..86c4a638 100644
--- a/tests/gem_linear_blits.c
+++ b/tests/gem_linear_blits.c
@@ -54,16 +54,6 @@
static uint32_t linear[WIDTH*HEIGHT];
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static void
copy(int fd, uint32_t dst, uint32_t src)
{
diff --git a/tests/gem_stress.c b/tests/gem_stress.c
index 44fcfbaa..7f939640 100644
--- a/tests/gem_stress.c
+++ b/tests/gem_stress.c
@@ -65,15 +65,6 @@
* first one (to check consistency of the kernel recovery paths)
*/
-static uint64_t gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 256*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
int drm_fd;
diff --git a/tests/gem_tiled_blits.c b/tests/gem_tiled_blits.c
index 8c48b760..635027da 100644
--- a/tests/gem_tiled_blits.c
+++ b/tests/gem_tiled_blits.c
@@ -61,16 +61,6 @@ static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
static int width = 512, height = 512;
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static drm_intel_bo *
create_bo(uint32_t start_val)
{
diff --git a/tests/gem_tiled_fence_blits.c b/tests/gem_tiled_fence_blits.c
index 93a038a2..9cc8e046 100644
--- a/tests/gem_tiled_fence_blits.c
+++ b/tests/gem_tiled_fence_blits.c
@@ -62,16 +62,6 @@ struct intel_batchbuffer *batch;
static int width = 512, height = 512;
static uint32_t linear[1024*1024/4];
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static drm_intel_bo *
create_bo(int fd, uint32_t start_val)
{
diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
index 93fa2cfd..b8868214 100644
--- a/tests/gem_vmap_blits.c
+++ b/tests/gem_vmap_blits.c
@@ -87,16 +87,6 @@ static void gem_vmap_sync(int fd, uint32_t handle)
gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
}
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static void
gem_read(int fd, uint32_t handle, int offset, int size, void *buf)
{
diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
index c60dbd1e..0e2fdbc6 100644
--- a/tests/gen3_mixed_blits.c
+++ b/tests/gen3_mixed_blits.c
@@ -65,16 +65,6 @@ static inline uint32_t pack_float(float f)
return u.dw;
}
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
uint32_t offset,
uint32_t handle,
diff --git a/tests/gen3_render_linear_blits.c b/tests/gen3_render_linear_blits.c
index c9c38847..f4747894 100644
--- a/tests/gen3_render_linear_blits.c
+++ b/tests/gen3_render_linear_blits.c
@@ -65,16 +65,6 @@ static inline uint32_t pack_float(float f)
return u.dw;
}
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
uint32_t offset,
uint32_t handle,
diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c
index b03cc65f..1c3d5287 100644
--- a/tests/gen3_render_mixed_blits.c
+++ b/tests/gen3_render_mixed_blits.c
@@ -65,16 +65,6 @@ static inline uint32_t pack_float(float f)
return u.dw;
}
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
uint32_t offset,
uint32_t handle,
diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c
index ce1ed3e0..c9e6ff99 100644
--- a/tests/gen3_render_tiledx_blits.c
+++ b/tests/gen3_render_tiledx_blits.c
@@ -65,16 +65,6 @@ static inline uint32_t pack_float(float f)
return u.dw;
}
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
uint32_t offset,
uint32_t handle,
diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c
index dfc9c25b..922ea1db 100644
--- a/tests/gen3_render_tiledy_blits.c
+++ b/tests/gen3_render_tiledy_blits.c
@@ -65,16 +65,6 @@ static inline uint32_t pack_float(float f)
return u.dw;
}
-static uint64_t
-gem_aperture_size(int fd)
-{
- struct drm_i915_gem_get_aperture aperture;
-
- aperture.aper_size = 512*1024*1024;
- (void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
- return aperture.aper_size;
-}
-
static uint32_t fill_reloc(struct drm_i915_gem_relocation_entry *reloc,
uint32_t offset,
uint32_t handle,
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 01:47:45 +0000