From 9792e7b58095dc03e63c105c494308ed771168f6 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 9 Oct 2015 16:47:05 +0300 Subject: s/gem_mmap/gem_mmap__gtt/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get rid of the gem_mmap() alias of gem_mmap__gtt(). I don't see any point in having it. Signed-off-by: Ville Syrjälä Stochastically-reviwewed-by: Chris Wilson --- lib/igt_fb.c | 2 +- lib/ioctl_wrappers.h | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/igt_fb.c b/lib/igt_fb.c index d04f02c0..713bd506 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -775,7 +775,7 @@ static void destroy_cairo_surface__gtt(void *arg) static void create_cairo_surface__gtt(int fd, struct igt_fb *fb) { fb->cairo_surface = - cairo_image_surface_create_for_data(gem_mmap(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE), + cairo_image_surface_create_for_data(gem_mmap__gtt(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE), drm_format_to_cairo(fb->drm_format), fb->width, fb->height, fb->stride); diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index f4deca6b..7c607a23 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -76,22 +76,6 @@ void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsi */ #define gem_require_mmap_wc(fd) igt_require(gem_mmap__has_wc(fd)) -/** - * gem_mmap: - * @fd: open i915 drm file descriptor - * @handle: gem buffer object handle - * @size: size of the gem buffer - * @prot: memory protection bits as used by mmap() - * - * This functions wraps up procedure to establish a memory mapping through the - * GTT. - * - * This is a simple convenience alias to gem_mmap__gtt() - * - * Returns: A pointer to the created memory mapping. - */ -#define gem_mmap(fd, handle, size, prot) gem_mmap__gtt(fd, handle, size, prot) - int gem_madvise(int fd, uint32_t handle, int state); uint32_t gem_context_create(int fd); -- cgit v1.2.3