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_mmap.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_mmap.c')
| -rw-r--r-- | tests/gem_mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c index 41884292..37d09339 100644 --- a/tests/gem_mmap.c +++ b/tests/gem_mmap.c @@ -80,7 +80,7 @@ test_huge_bo(int huge) bo = gem_create(fd, huge_object_size); /* Obtain CPU mapping for the object. */ - ptr_cpu = gem_mmap__cpu(fd, bo, 0, huge_object_size, + ptr_cpu = __gem_mmap__cpu(fd, bo, 0, huge_object_size, PROT_READ | PROT_WRITE); igt_require(ptr_cpu); gem_set_domain(fd, bo, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); @@ -166,7 +166,7 @@ igt_main igt_subtest("short-mmap") { igt_assert(OBJECT_SIZE > 4096); arg.handle = gem_create(fd, OBJECT_SIZE); - addr = gem_mmap__cpu(fd, arg.handle, 0, 4096, PROT_WRITE); + addr = __gem_mmap__cpu(fd, arg.handle, 0, 4096, PROT_WRITE); igt_assert(addr); memset(addr, 0, 4096); munmap(addr, 4096); |