From a265766a7afdee654b331ed40bed996be02cf72a Mon Sep 17 00:00:00 2001 From: Lukasz Kalamarz Date: Fri, 11 Jan 2019 15:49:12 +0100 Subject: lib/ioctl_wrapper: Implement __gem_mmap Previous implementation of __gem_mmap__cpu and __gem_mmap_wc only differ with setting proper flag for caching. This patch implement __gem_mmap, which merge those two functions into one v2: Reordered and splited this patch into two separete patches v3: Dropped unnecessary check v4: Remerge patches again and fixed __gem_mmap description Signed-off-by: Lukasz Kalamarz Cc: Michal Winiarski Cc: Katarzyna Dec Cc: Daniele Ceraolo Spurio Cc: Chris Wilson Cc: Michal Wajdeczko Reviewed-by: Chris Wilson --- lib/ioctl_wrappers.c | 54 +++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'lib/ioctl_wrappers.c') diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index f71f0e32..19e59794 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -737,34 +737,32 @@ bool gem_mmap__has_wc(int fd) } /** - * __gem_mmap__wc: + * __gem_mmap: * @fd: open i915 drm file descriptor * @handle: gem buffer object handle * @offset: offset in the gem buffer of the mmap arena * @size: size of the mmap arena * @prot: memory protection bits as used by mmap() + * @flags: flags used to determine caching * * This functions wraps up procedure to establish a memory mapping through - * direct cpu access, bypassing the gpu and cpu caches completely and also - * bypassing the GTT system agent (i.e. there is no automatic tiling of - * the mmapping through the fence registers). + * direct cpu access, bypassing the gpu (valid for wc == false). For wc == true + * it also bypass cpu caches completely and GTT system agent (i.e. there is no + * automatic tiling of the mmapping through the fence registers). * * Returns: A pointer to the created memory mapping, NULL on failure. */ -void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot) +static void +*__gem_mmap(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned int prot, uint64_t flags) { struct drm_i915_gem_mmap arg; - if (!gem_mmap__has_wc(fd)) { - errno = ENOSYS; - return NULL; - } - memset(&arg, 0, sizeof(arg)); arg.handle = handle; arg.offset = offset; arg.size = size; - arg.flags = I915_MMAP_WC; + arg.flags = flags; + if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &arg)) return NULL; @@ -774,6 +772,26 @@ void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, un return from_user_pointer(arg.addr_ptr); } +/** + * __gem_mmap__wc: + * @fd: open i915 drm file descriptor + * @handle: gem buffer object handle + * @offset: offset in the gem buffer of the mmap arena + * @size: size of the mmap arena + * @prot: memory protection bits as used by mmap() + * + * This functions wraps up procedure to establish a memory mapping through + * direct cpu access, bypassing the gpu and cpu caches completely and also + * bypassing the GTT system agent (i.e. there is no automatic tiling of + * the mmapping through the fence registers). + * + * Returns: A pointer to the created memory mapping, NULL on failure. + */ +void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot) +{ + return __gem_mmap(fd, handle, offset, size, prot, I915_MMAP_WC); +} + /** * gem_mmap__wc: * @fd: open i915 drm file descriptor @@ -808,19 +826,7 @@ void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsi */ void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot) { - struct drm_i915_gem_mmap mmap_arg; - - memset(&mmap_arg, 0, sizeof(mmap_arg)); - mmap_arg.handle = handle; - mmap_arg.offset = offset; - mmap_arg.size = size; - if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) - return NULL; - - VG(VALGRIND_MAKE_MEM_DEFINED(from_user_pointer(mmap_arg.addr_ptr), mmap_arg.size)); - - errno = 0; - return from_user_pointer(mmap_arg.addr_ptr); + return __gem_mmap(fd, handle, offset, size, prot, 0); } /** -- cgit v1.2.3