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 /benchmarks | |
| 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 'benchmarks')
| -rw-r--r-- | benchmarks/gem_blt.c | 2 | ||||
| -rw-r--r-- | benchmarks/gem_exec_reloc.c | 6 | ||||
| -rw-r--r-- | benchmarks/gem_mmap.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/benchmarks/gem_blt.c b/benchmarks/gem_blt.c index 3ed23003..e7225410 100644 --- a/benchmarks/gem_blt.c +++ b/benchmarks/gem_blt.c @@ -177,7 +177,7 @@ static int run(int object, int batch, int count, int reps) fd = drm_open_driver(DRIVER_INTEL); handle = gem_create(fd, size); - buf = gem_mmap__cpu(fd, handle, 0, size, PROT_WRITE); + buf = __gem_mmap__cpu(fd, handle, 0, size, PROT_WRITE); igt_assert(buf); gen = intel_gen(intel_get_drm_devid(fd)); diff --git a/benchmarks/gem_exec_reloc.c b/benchmarks/gem_exec_reloc.c index 274ce41a..5be482a7 100644 --- a/benchmarks/gem_exec_reloc.c +++ b/benchmarks/gem_exec_reloc.c @@ -115,13 +115,13 @@ static int run(unsigned batch_size, if (num_relocs) { size = ALIGN(sizeof(*mem_reloc)*num_relocs, 4096); reloc_handle = gem_create(fd, size); - reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE); + reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE); memcpy(reloc, mem_reloc, sizeof(*mem_reloc)*num_relocs); munmap(reloc, size); if (flags & FAULT) { igt_disable_prefault(); - reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE); + reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE); } else reloc = mem_reloc; } @@ -162,7 +162,7 @@ static int run(unsigned batch_size, } if (flags & FAULT && reloc) { munmap(reloc, size); - reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE); + reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE); gem_exec[num_objects].relocs_ptr = (uintptr_t)reloc; } gem_execbuf(fd, &execbuf); 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; |