diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-08-22 00:30:36 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-08-22 00:30:36 +0000 |
| commit | ca5aa37280ded3370d495f0c56c4a31dd633fdf8 (patch) | |
| tree | aa22147982f7a8b85b57e22e80b33b9a34961d4b /lib/libdrm/libkms/intel.c | |
| parent | cde466ed50e79a55b4c7495ef43f87c8291c1ce8 (diff) | |
Merge libdrm 2.4.64. This changes the build to using the upstream
auto* build system and installing/using a libdrm specific set of drm
headers. Thanks to Emil Velikov for removing the GNU makeisms
upstream.
Diffstat (limited to 'lib/libdrm/libkms/intel.c')
| -rw-r--r-- | lib/libdrm/libkms/intel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/libdrm/libkms/intel.c b/lib/libdrm/libkms/intel.c index 52ddcb19e..3d8ca055f 100644 --- a/lib/libdrm/libkms/intel.c +++ b/lib/libdrm/libkms/intel.c @@ -26,8 +26,9 @@ **************************************************************************/ -#define HAVE_STDINT_H -#define _FILE_OFFSET_BITS 64 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <errno.h> #include <stdio.h> @@ -35,9 +36,9 @@ #include <string.h> #include "internal.h" -#include <sys/mman.h> #include <sys/ioctl.h> #include "xf86drm.h" +#include "libdrm_macros.h" #include "i915_drm.h" @@ -172,7 +173,7 @@ intel_bo_map(struct kms_bo *_bo, void **out) if (ret) return ret; - map = mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset); + map = drm_mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset); if (map == MAP_FAILED) return -errno; @@ -200,7 +201,7 @@ intel_bo_destroy(struct kms_bo *_bo) if (bo->base.ptr) { /* XXX Sanity check map_count */ - munmap(bo->base.ptr, bo->base.size); + drm_munmap(bo->base.ptr, bo->base.size); bo->base.ptr = NULL; } |