From: Chad Versace <chad.versace@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
Date: Fri, 23 Dec 2011 12:11:10 -0800 [thread overview]
Message-ID: <1324671072-26404-2-git-send-email-chad.versace@linux.intel.com> (raw)
In-Reply-To: <1324671072-26404-1-git-send-email-chad.versace@linux.intel.com>
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
next prev parent reply other threads:[~2011-12-23 20:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-23 20:11 [PATCH 0/3] libdrm/intel: Add support for Android Chad Versace
2011-12-23 20:11 ` Chad Versace [this message]
2011-12-27 20:40 ` [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android Eric Anholt
2011-12-28 14:56 ` Eugeni Dodonov
2011-12-28 15:11 ` Purushothaman, Vijay A
2011-12-29 23:47 ` Chad Versace
2011-12-30 5:13 ` Purushothaman, Vijay A
2012-05-09 7:33 ` iyshwarya
2012-05-09 9:11 ` Sateesh Kavuri
2012-05-09 10:11 ` Sateesh Kavuri
2012-05-09 19:46 ` Daniel Vetter
2012-05-09 7:35 ` Engineer
2012-05-09 8:20 ` Purushothaman, Vijay A
2011-12-29 0:45 ` Chad Versace
2011-12-23 20:11 ` [PATCH 2/3] libdrm,intel: Factor source file lists into sources.mk Chad Versace
2011-12-23 20:11 ` [PATCH 3/3] libdrm,intel: Add Android makefiles Chad Versace
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324671072-26404-2-git-send-email-chad.versace@linux.intel.com \
--to=chad.versace@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox