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_fb.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_fb.c')
| -rw-r--r-- | lib/igt_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c index e225f8ac..5ab063fc 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -745,7 +745,7 @@ static void create_cairo_surface__blit(int fd, struct igt_fb *fb) I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); /* Setup cairo context */ - blit->linear.map = gem_mmap__cpu(fd, + blit->linear.map = __gem_mmap__cpu(fd, blit->linear.handle, 0, blit->linear.size, @@ -774,7 +774,7 @@ static void destroy_cairo_surface__gtt(void *arg) static void create_cairo_surface__gtt(int fd, struct igt_fb *fb) { - void *ptr = gem_mmap__gtt(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE); + void *ptr = __gem_mmap__gtt(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE); igt_assert(ptr); fb->cairo_surface = |