do not install libdrm_intel on ARM

[platform/upstream/libdrm.git] / libkms / intel.c

diff --git a/libkms/intel.c b/libkms/intel.c
index a1914f8..51a7fd2 100644 (file)
--- a/libkms/intel.c
+++ b/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,18 +36,16 @@
 #include <string.h>
 #include "internal.h"
 
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include "xf86drm.h"
+#include "libdrm.h"
 
 #include "i915_drm.h"
 
 struct intel_bo
 {
        struct kms_bo base;
-       unsigned handle;
        unsigned map_count;
-       int mapped;
 };
 
 static int
@@ -103,6 +102,7 @@ intel_bo_create(struct kms_driver *kms,
                pitch = (pitch + 512 - 1) & ~(512 - 1);
                size = pitch * ((height + 4 - 1) & ~(4 - 1));
        } else {
+               free(bo);
                return -EINVAL;
        }
 
@@ -173,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;
 
@@ -201,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;
        }