[igt-dev] [PATCH i-g-t 1/2] lib/i915: Move mmap IOCTLs wrappers into separate file
Petri Latvala
petri.latvala at intel.com
Tue Feb 26 09:49:27 UTC 2019
On Mon, Feb 25, 2019 at 04:20:19PM -0800, Antonio Argenziano wrote:
> Move all mmap flavours and support function to separate file in i915
> folder. This helps with moving i915 specific functions away from common
> libraries.
>
> Signed-off-by: Antonio Argenziano <antonio.argenziano at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> ---
> lib/i915/gem_mman.c | 254 +++++++++++++++++++++++++++++++++++++++++++
> lib/i915/gem_mman.h | 55 ++++++++++
> lib/ioctl_wrappers.c | 213 ------------------------------------
> lib/ioctl_wrappers.h | 23 +---
> lib/meson.build | 1 +
Where's the change to lib/Makefile.sources?
--
Petri Latvala
> 5 files changed, 311 insertions(+), 235 deletions(-)
> create mode 100644 lib/i915/gem_mman.c
> create mode 100644 lib/i915/gem_mman.h
>
> diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c
> new file mode 100644
> index 00000000..3cf9a6bb
> --- /dev/null
> +++ b/lib/i915/gem_mman.c
> @@ -0,0 +1,254 @@
> +/*
> + * Copyright © 2007, 2011, 2013, 2014, 2019 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include <stdbool.h>
> +#include <sys/ioctl.h>
> +#include <errno.h>
> +
> +#include "igt_core.h"
> +#include "ioctl_wrappers.h"
> +
> +#include "gem_mman.h"
> +
> +#ifdef HAVE_VALGRIND
> +#include <valgrind/valgrind.h>
> +#include <valgrind/memcheck.h>
> +
> +#define VG(x) x
> +#else
> +#define VG(x) do {} while (0)
> +#endif
> +
> +/**
> + * __gem_mmap__gtt:
> + * @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.
> + *
> + * Returns: A pointer to the created memory mapping, NULL on failure.
> + */
> +void *__gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot)
> +{
> + struct drm_i915_gem_mmap_gtt mmap_arg;
> + void *ptr;
> +
> + memset(&mmap_arg, 0, sizeof(mmap_arg));
> + mmap_arg.handle = handle;
> + if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg))
> + return NULL;
> +
> + ptr = mmap64(0, size, prot, MAP_SHARED, fd, mmap_arg.offset);
> + if (ptr == MAP_FAILED)
> + ptr = NULL;
> + else
> + errno = 0;
> +
> + VG(VALGRIND_MAKE_MEM_DEFINED(ptr, size));
> +
> + return ptr;
> +}
> +
> +/**
> + * gem_mmap__gtt:
> + * @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()
> + *
> + * Like __gem_mmap__gtt() except we assert on failure.
> + *
> + * Returns: A pointer to the created memory mapping
> + */
> +void *gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot)
> +{
> + void *ptr = __gem_mmap__gtt(fd, handle, size, prot);
> + igt_assert(ptr);
> + return ptr;
> +}
> +
> +int gem_munmap(void *ptr, uint64_t size)
> +{
> + int ret = munmap(ptr, size);
> +
> + if (ret == 0)
> + VG(VALGRIND_MAKE_MEM_NOACCESS(ptr, size));
> +
> + return ret;
> +}
> +
> +bool gem_mmap__has_wc(int fd)
> +{
> + static int has_wc = -1;
> +
> + if (has_wc == -1) {
> + struct drm_i915_getparam gp;
> + int mmap_version = -1;
> + int gtt_version = -1;
> +
> + has_wc = 0;
> +
> + memset(&gp, 0, sizeof(gp));
> + gp.param = I915_PARAM_MMAP_GTT_VERSION;
> + gp.value = >t_version;
> + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> +
> + memset(&gp, 0, sizeof(gp));
> + gp.param = I915_PARAM_MMAP_VERSION;
> + gp.value = &mmap_version;
> + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> +
> + /* Do we have the new mmap_ioctl with DOMAIN_WC? */
> + if (mmap_version >= 1 && gtt_version >= 2) {
> + struct drm_i915_gem_mmap arg;
> +
> + /* Does this device support wc-mmaps ? */
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = gem_create(fd, 4096);
> + arg.offset = 0;
> + arg.size = 4096;
> + arg.flags = I915_MMAP_WC;
> + has_wc = igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &arg) == 0;
> + gem_close(fd, arg.handle);
> + }
> + errno = 0;
> + }
> +
> + return has_wc > 0;
> +}
> +
> +/**
> + * __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 (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.
> + */
> +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;
> +
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = handle;
> + arg.offset = offset;
> + arg.size = size;
> + arg.flags = flags;
> +
> + if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &arg))
> + return NULL;
> +
> + VG(VALGRIND_MAKE_MEM_DEFINED(from_user_pointer(arg.addr_ptr), arg.size));
> +
> + errno = 0;
> + 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
> + * @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()
> + *
> + * Like __gem_mmap__wc() except we assert on failure.
> + *
> + * Returns: A pointer to the created memory mapping
> + */
> +void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> +{
> + void *ptr = __gem_mmap__wc(fd, handle, offset, size, prot);
> + igt_assert(ptr);
> + return ptr;
> +}
> +
> +/**
> + * __gem_mmap__cpu:
> + * @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 completely.
> + *
> + * Returns: A pointer to the created memory mapping, NULL on failure.
> + */
> +void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> +{
> + return __gem_mmap(fd, handle, offset, size, prot, 0);
> +}
> +
> +/**
> + * gem_mmap__cpu:
> + * @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()
> + *
> + * Like __gem_mmap__cpu() except we assert on failure.
> + *
> + * Returns: A pointer to the created memory mapping
> + */
> +void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> +{
> + void *ptr = __gem_mmap__cpu(fd, handle, offset, size, prot);
> + igt_assert(ptr);
> + return ptr;
> +}
> diff --git a/lib/i915/gem_mman.h b/lib/i915/gem_mman.h
> new file mode 100644
> index 00000000..f7242ed7
> --- /dev/null
> +++ b/lib/i915/gem_mman.h
> @@ -0,0 +1,55 @@
> +/*
> + * Copyright © 2007, 2011, 2013, 2014, 2019 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#ifndef GEM_MMAN_H
> +#define GEM_MMAN_H
> +
> +void *gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot);
> +void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> +
> +bool gem_mmap__has_wc(int fd);
> +void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> +
> +#ifndef I915_GEM_DOMAIN_WC
> +#define I915_GEM_DOMAIN_WC 0x80
> +#endif
> +
> +void *__gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot);
> +void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> +void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> +
> +int gem_munmap(void *ptr, uint64_t size);
> +
> +/**
> + * gem_require_mmap_wc:
> + * @fd: open i915 drm file descriptor
> + *
> + * Feature test macro to query whether direct (i.e. cpu access path, bypassing
> + * the gtt) write-combine memory mappings are available. Automatically skips
> + * through igt_require() if not.
> + */
> +#define gem_require_mmap_wc(fd) igt_require(gem_mmap__has_wc(fd))
> +
> +#endif /* GEM_MMAN_H */
> +
> diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
> index 404c2fbf..39920f87 100644
> --- a/lib/ioctl_wrappers.c
> +++ b/lib/ioctl_wrappers.c
> @@ -641,219 +641,6 @@ void gem_execbuf_wr(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
> igt_assert_eq(__gem_execbuf_wr(fd, execbuf), 0);
> }
>
> -/**
> - * __gem_mmap__gtt:
> - * @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.
> - *
> - * Returns: A pointer to the created memory mapping, NULL on failure.
> - */
> -void *__gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot)
> -{
> - struct drm_i915_gem_mmap_gtt mmap_arg;
> - void *ptr;
> -
> - memset(&mmap_arg, 0, sizeof(mmap_arg));
> - mmap_arg.handle = handle;
> - if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg))
> - return NULL;
> -
> - ptr = mmap64(0, size, prot, MAP_SHARED, fd, mmap_arg.offset);
> - if (ptr == MAP_FAILED)
> - ptr = NULL;
> - else
> - errno = 0;
> -
> - VG(VALGRIND_MAKE_MEM_DEFINED(ptr, size));
> -
> - return ptr;
> -}
> -
> -/**
> - * gem_mmap__gtt:
> - * @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()
> - *
> - * Like __gem_mmap__gtt() except we assert on failure.
> - *
> - * Returns: A pointer to the created memory mapping
> - */
> -void *gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot)
> -{
> - void *ptr = __gem_mmap__gtt(fd, handle, size, prot);
> - igt_assert(ptr);
> - return ptr;
> -}
> -
> -int gem_munmap(void *ptr, uint64_t size)
> -{
> - int ret = munmap(ptr, size);
> -
> - if (ret == 0)
> - VG(VALGRIND_MAKE_MEM_NOACCESS(ptr, size));
> -
> - return ret;
> -}
> -
> -bool gem_mmap__has_wc(int fd)
> -{
> - static int has_wc = -1;
> -
> - if (has_wc == -1) {
> - struct drm_i915_getparam gp;
> - int mmap_version = -1;
> - int gtt_version = -1;
> -
> - has_wc = 0;
> -
> - memset(&gp, 0, sizeof(gp));
> - gp.param = I915_PARAM_MMAP_GTT_VERSION;
> - gp.value = >t_version;
> - ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> -
> - memset(&gp, 0, sizeof(gp));
> - gp.param = I915_PARAM_MMAP_VERSION;
> - gp.value = &mmap_version;
> - ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> -
> - /* Do we have the new mmap_ioctl with DOMAIN_WC? */
> - if (mmap_version >= 1 && gtt_version >= 2) {
> - struct drm_i915_gem_mmap arg;
> -
> - /* Does this device support wc-mmaps ? */
> - memset(&arg, 0, sizeof(arg));
> - arg.handle = gem_create(fd, 4096);
> - arg.offset = 0;
> - arg.size = 4096;
> - arg.flags = I915_MMAP_WC;
> - has_wc = igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &arg) == 0;
> - gem_close(fd, arg.handle);
> - }
> - errno = 0;
> - }
> -
> - return has_wc > 0;
> -}
> -
> -/**
> - * __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 (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.
> - */
> -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;
> -
> - memset(&arg, 0, sizeof(arg));
> - arg.handle = handle;
> - arg.offset = offset;
> - arg.size = size;
> - arg.flags = flags;
> -
> - if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &arg))
> - return NULL;
> -
> - VG(VALGRIND_MAKE_MEM_DEFINED(from_user_pointer(arg.addr_ptr), arg.size));
> -
> - errno = 0;
> - 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
> - * @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()
> - *
> - * Like __gem_mmap__wc() except we assert on failure.
> - *
> - * Returns: A pointer to the created memory mapping
> - */
> -void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> -{
> - void *ptr = __gem_mmap__wc(fd, handle, offset, size, prot);
> - igt_assert(ptr);
> - return ptr;
> -}
> -
> -/**
> - * __gem_mmap__cpu:
> - * @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 completely.
> - *
> - * Returns: A pointer to the created memory mapping, NULL on failure.
> - */
> -void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> -{
> - return __gem_mmap(fd, handle, offset, size, prot, 0);
> -}
> -
> -/**
> - * gem_mmap__cpu:
> - * @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()
> - *
> - * Like __gem_mmap__cpu() except we assert on failure.
> - *
> - * Returns: A pointer to the created memory mapping
> - */
> -void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> -{
> - void *ptr = __gem_mmap__cpu(fd, handle, offset, size, prot);
> - igt_assert(ptr);
> - return ptr;
> -}
> -
> /**
> * gem_madvise:
> * @fd: open i915 drm file descriptor
> diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
> index b22b36b0..54703235 100644
> --- a/lib/ioctl_wrappers.h
> +++ b/lib/ioctl_wrappers.h
> @@ -38,6 +38,7 @@
>
> #include "i915/gem_context.h"
> #include "i915/gem_scheduler.h"
> +#include "i915/gem_mman.h"
>
> /**
> * igt_ioctl:
> @@ -84,22 +85,10 @@ int __gem_execbuf_wr(int fd, struct drm_i915_gem_execbuffer2 *execbuf);
> void gem_execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf);
> int __gem_execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf);
>
> -void *gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot);
> -void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> -
> -bool gem_mmap__has_wc(int fd);
> -void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> -
> #ifndef I915_GEM_DOMAIN_WC
> #define I915_GEM_DOMAIN_WC 0x80
> #endif
>
> -void *__gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot);
> -void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> -void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
> -
> -int gem_munmap(void *ptr, uint64_t size);
> -
> /**
> * gem_require_stolen_support:
> * @fd: open i915 drm file descriptor
> @@ -111,16 +100,6 @@ int gem_munmap(void *ptr, uint64_t size);
> igt_require(gem_create__has_stolen_support(fd) && \
> (gem_total_stolen_size(fd) > 0))
>
> -/**
> - * gem_require_mmap_wc:
> - * @fd: open i915 drm file descriptor
> - *
> - * Feature test macro to query whether direct (i.e. cpu access path, bypassing
> - * the gtt) write-combine memory mappings are available. Automatically skips
> - * through igt_require() if not.
> - */
> -#define gem_require_mmap_wc(fd) igt_require(gem_mmap__has_wc(fd))
> -
> int gem_madvise(int fd, uint32_t handle, int state);
>
> #define LOCAL_I915_GEM_USERPTR 0x33
> diff --git a/lib/meson.build b/lib/meson.build
> index dd36f818..0eb5585d 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -4,6 +4,7 @@ lib_sources = [
> 'i915/gem_scheduler.c',
> 'i915/gem_submission.c',
> 'i915/gem_ring.c',
> + 'i915/gem_mman.c',
> 'igt_color_encoding.c',
> 'igt_debugfs.c',
> 'igt_device.c',
> --
> 2.20.1
>
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
More information about the igt-dev
mailing list