From b8a77dd6c8e9f73493b2f86f293ff9c06fc08049 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 9 Oct 2015 18:29:28 +0300 Subject: Make gem_mmap__{cpu,gtt,wc}() assert on failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Stochastically-reviwewed-by: Chris Wilson --- benchmarks/gem_mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'benchmarks/gem_mmap.c') diff --git a/benchmarks/gem_mmap.c b/benchmarks/gem_mmap.c index 6bf7fd3a..571f7578 100644 --- a/benchmarks/gem_mmap.c +++ b/benchmarks/gem_mmap.c @@ -115,17 +115,17 @@ int main(int argc, char **argv) handle = gem_create(fd, OBJECT_SIZE); switch (map) { case CPU: - ptr = gem_mmap__cpu(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); + ptr = __gem_mmap__cpu(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); igt_assert(ptr); gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); break; case GTT: - ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_WRITE); + ptr = __gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_WRITE); igt_assert(ptr); gem_set_domain(fd, handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); break; case WC: - ptr = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); + ptr = __gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); igt_assert(ptr); gem_set_domain(fd, handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); break; -- cgit v1.2.3