diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 18:29:28 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 19:16:26 +0300 |
| commit | b8a77dd6c8e9f73493b2f86f293ff9c06fc08049 (patch) | |
| tree | 7e43c045f1ff755144818b71b6d89942667c3565 /tests/gem_pwrite_pread.c | |
| parent | 106fe21373f9c3eadcd95fb4b48e452f9b328ffa (diff) | |
Make gem_mmap__{cpu,gtt,wc}() assert on failure
Rename the current gem_mmap__{cpu,gtt,wc}() functions into
__gem_mmap__{cpu,gtt,wc}(), and add back wrappers with the original name
that assert that the pointer is valid. Most callers will expect a valid
pointer and shouldn't have to bother with failures.
To avoid changing anything (yet), sed 's/gem_mmap__/__gem_mmap__/g'
over the entire codebase.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/gem_pwrite_pread.c')
| -rw-r--r-- | tests/gem_pwrite_pread.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c index 1e8f5be9..54081409 100644 --- a/tests/gem_pwrite_pread.c +++ b/tests/gem_pwrite_pread.c @@ -112,9 +112,9 @@ static void as_gtt_mmap(int fd, uint32_t src, uint32_t dst, void *buf, int len, uint32_t *src_ptr, *dst_ptr; BUILD_EXEC; - src_ptr = gem_mmap__gtt(fd, src, OBJECT_SIZE, PROT_WRITE); + src_ptr = __gem_mmap__gtt(fd, src, OBJECT_SIZE, PROT_WRITE); igt_assert(src_ptr); - dst_ptr = gem_mmap__gtt(fd, dst, OBJECT_SIZE, PROT_READ); + dst_ptr = __gem_mmap__gtt(fd, dst, OBJECT_SIZE, PROT_READ); igt_assert(dst_ptr); while (loops--) { @@ -139,9 +139,9 @@ static void as_cpu_mmap(int fd, uint32_t src, uint32_t dst, void *buf, int len, uint32_t *src_ptr, *dst_ptr; BUILD_EXEC; - src_ptr = gem_mmap__cpu(fd, src, 0, OBJECT_SIZE, PROT_WRITE); + src_ptr = __gem_mmap__cpu(fd, src, 0, OBJECT_SIZE, PROT_WRITE); igt_assert(src_ptr); - dst_ptr = gem_mmap__cpu(fd, dst, 0, OBJECT_SIZE, PROT_READ); + dst_ptr = __gem_mmap__cpu(fd, dst, 0, OBJECT_SIZE, PROT_READ); igt_assert(dst_ptr); while (loops--) { @@ -186,9 +186,9 @@ static void test_as_gtt_mmap(int fd, uint32_t src, uint32_t dst, int len) int i; BUILD_EXEC; - src_ptr = gem_mmap__gtt(fd, src, OBJECT_SIZE, PROT_WRITE); + src_ptr = __gem_mmap__gtt(fd, src, OBJECT_SIZE, PROT_WRITE); igt_assert(src_ptr); - dst_ptr = gem_mmap__gtt(fd, dst, OBJECT_SIZE, PROT_READ); + dst_ptr = __gem_mmap__gtt(fd, dst, OBJECT_SIZE, PROT_READ); igt_assert(dst_ptr); gem_set_domain(fd, src, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); @@ -212,9 +212,9 @@ static void test_as_cpu_mmap(int fd, uint32_t src, uint32_t dst, int len) int i; BUILD_EXEC; - src_ptr = gem_mmap__cpu(fd, src, 0, OBJECT_SIZE, PROT_WRITE); + src_ptr = __gem_mmap__cpu(fd, src, 0, OBJECT_SIZE, PROT_WRITE); igt_assert(src_ptr); - dst_ptr = gem_mmap__cpu(fd, dst, 0, OBJECT_SIZE, PROT_READ); + dst_ptr = __gem_mmap__cpu(fd, dst, 0, OBJECT_SIZE, PROT_READ); igt_assert(dst_ptr); gem_set_domain(fd, src, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); |