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 /demos | |
| 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 'demos')
| -rw-r--r-- | demos/intel_sprite_on.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/intel_sprite_on.c b/demos/intel_sprite_on.c index 40830706..6dddded2 100644 --- a/demos/intel_sprite_on.c +++ b/demos/intel_sprite_on.c @@ -359,7 +359,7 @@ static int prepare_primary_surface(int fd, int prim_width, int prim_height, if (tiled) gem_set_tiling(fd, *prim_handle, I915_TILING_X, *prim_stride); - prim_fb_ptr = gem_mmap__gtt(fd, *prim_handle, *prim_size, PROT_READ | PROT_WRITE); + prim_fb_ptr = __gem_mmap__gtt(fd, *prim_handle, *prim_size, PROT_READ | PROT_WRITE); if (prim_fb_ptr != NULL) { // Write primary surface with gray background @@ -454,7 +454,7 @@ static int prepare_sprite_surfaces(int fd, int sprite_width, int sprite_height, gem_set_tiling(fd, sprite_handles[i], I915_TILING_X, *sprite_stride); // Get pointer to the surface - sprite_fb_ptr = gem_mmap__gtt(fd, + sprite_fb_ptr = __gem_mmap__gtt(fd, sprite_handles[i], *sprite_size, PROT_READ | PROT_WRITE); |