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 /lib/igt_draw.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 'lib/igt_draw.c')
-rw-r--r-- | lib/igt_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/igt_draw.c b/lib/igt_draw.c index 38ecae0f..07aa8129 100644 --- a/lib/igt_draw.c +++ b/lib/igt_draw.c @@ -252,7 +252,7 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect, if (tiling != I915_TILING_NONE) igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5); - ptr = gem_mmap__cpu(fd, buf->handle, 0, buf->size, 0); + ptr = __gem_mmap__cpu(fd, buf->handle, 0, buf->size, 0); igt_assert(ptr); switch (tiling) { @@ -281,7 +281,7 @@ static void draw_rect_mmap_gtt(int fd, struct buf_data *buf, struct rect *rect, gem_set_domain(fd, buf->handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); - ptr = gem_mmap__gtt(fd, buf->handle, buf->size, PROT_READ | PROT_WRITE); + ptr = __gem_mmap__gtt(fd, buf->handle, buf->size, PROT_READ | PROT_WRITE); igt_assert(ptr); draw_rect_ptr_linear(ptr, buf->stride, rect, color, buf->bpp); @@ -303,7 +303,7 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect, if (tiling != I915_TILING_NONE) igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5); - ptr = gem_mmap__wc(fd, buf->handle, 0, buf->size, + ptr = __gem_mmap__wc(fd, buf->handle, 0, buf->size, PROT_READ | PROT_WRITE); igt_assert(ptr); |