android: intel: disable drm_intel_get_aperture_sizes

[android-x86/external-libdrm.git] / intel / intel_bufmgr.c

diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index ab57427..e0297dd 100644 (file)
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -36,7 +36,9 @@
 #include <errno.h>
 #include <drm.h>
 #include <i915_drm.h>
+#ifndef ANDROID
 #include <pciaccess.h>
+#endif
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "xf86drm.h"
@@ -104,7 +106,7 @@ drm_intel_bo_get_subdata(drm_intel_bo *bo, unsigned long offset,
                         unsigned long size, void *data)
 {
        int ret;
-       if (bo->bufmgr->bo_subdata)
+       if (bo->bufmgr->bo_get_subdata)
                return bo->bufmgr->bo_get_subdata(bo, offset, size, data);
 
        if (size == 0 || data == NULL)
@@ -172,7 +174,13 @@ int drm_intel_bo_flink(drm_intel_bo *bo, uint32_t * name)
 
        return -ENODEV;
 }
+int drm_intel_bo_prime(drm_intel_bo *bo, uint32_t * name)
+{
+       if (bo->bufmgr->bo_prime)
+               return bo->bufmgr->bo_prime(bo, name);
 
+       return -ENODEV;
+}
 int
 drm_intel_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,
                        drm_intel_bo *target_bo, uint32_t target_offset,
@@ -272,6 +280,7 @@ int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id)
        return -1;
 }
 
+#ifndef ANDROID
 static size_t
 drm_intel_probe_agp_aperture_size(int fd)
 {
@@ -319,3 +328,4 @@ int drm_intel_get_aperture_sizes(int fd,
        *total = aperture.aper_size;
        return 0;
 }
+#endif