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 e949ff2..e0297dd 100644 (file)
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -36,8 +36,12 @@
 #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"
 
 /** @file intel_bufmgr.c
  *
@@ -102,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)
@@ -143,11 +147,14 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
                                        cliprects, num_cliprects, DR4,
                                        rings);
 
-       if (rings == 0)
+       switch (rings) {
+       case I915_EXEC_DEFAULT:
+       case I915_EXEC_RENDER:
                return bo->bufmgr->bo_exec(bo, used,
                                           cliprects, num_cliprects, DR4);
-
-       return -ENODEV;
+       default:
+               return -ENODEV;
+       }
 }
 
 void drm_intel_bufmgr_set_debug(drm_intel_bufmgr *bufmgr, int enable_debug)
@@ -167,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,
@@ -266,3 +279,53 @@ int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id)
                return bufmgr->get_pipe_from_crtc_id(bufmgr, crtc_id);
        return -1;
 }
+
+#ifndef ANDROID
+static size_t
+drm_intel_probe_agp_aperture_size(int fd)
+{
+       struct pci_device *pci_dev;
+       size_t size = 0;
+       int ret;
+
+       ret = pci_system_init();
+       if (ret)
+               goto err;
+
+       /* XXX handle multiple adaptors? */
+       pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
+       if (pci_dev == NULL)
+               goto err;
+
+       ret = pci_device_probe(pci_dev);
+       if (ret)
+               goto err;
+
+       size = pci_dev->regions[2].size;
+err:
+       pci_system_cleanup ();
+       return size;
+}
+
+int drm_intel_get_aperture_sizes(int fd,
+                                size_t *mappable,
+                                size_t *total)
+{
+
+       struct drm_i915_gem_get_aperture aperture;
+       int ret;
+
+       ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+       if (ret)
+               return ret;
+
+       *mappable = 0;
+       /* XXX add a query for the kernel value? */
+       if (*mappable == 0)
+               *mappable = drm_intel_probe_agp_aperture_size(fd);
+       if (*mappable == 0)
+               *mappable = 64 * 1024 * 1024; /* minimum possible value */
+       *total = aperture.aper_size;
+       return 0;
+}
+#endif