From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chad Versace <chad.versace@linux.intel.com>
Subject: [PATCH 1/3] intel: Disable
	drm_intel_probe_agp_aperture_size() on Android
Date: Fri, 23 Dec 2011 12:11:10 -0800
Message-ID: <1324671072-26404-2-git-send-email-chad.versace@linux.intel.com>
References: <1324671072-26404-1-git-send-email-chad.versace@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [143.182.124.37])
	by gabe.freedesktop.org (Postfix) with ESMTP id B618FA0E9F
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 23 Dec 2011 12:11:15 -0800 (PST)
In-Reply-To: <1324671072-26404-1-git-send-email-chad.versace@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

The function uses libpciaccess, which is not present on Android.  So, make
it a no-op that returns 0.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
---
 intel/intel_bufmgr.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 905556f..d80b00e 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -36,11 +36,14 @@
 #include <errno.h>
 #include <drm.h>
 #include <i915_drm.h>
-#include <pciaccess.h>
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "xf86drm.h"
 
+#ifndef ANDROID
+#include <pciaccess.h>
+#endif
+
 /** @file intel_bufmgr.c
  *
  * Convenience functions for buffer management methods.
@@ -275,6 +278,10 @@ int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id)
 static size_t
 drm_intel_probe_agp_aperture_size(int fd)
 {
+#ifdef ANDROID
+	/* Android does not have libpciaccess. */
+	return 0;
+#else
 	struct pci_device *pci_dev;
 	size_t size = 0;
 	int ret;
@@ -296,6 +303,7 @@ drm_intel_probe_agp_aperture_size(int fd)
 err:
 	pci_system_cleanup ();
 	return size;
+#endif
 }
 
 int drm_intel_get_aperture_sizes(int fd,
-- 
1.7.7.4