* [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-23 20:11 [PATCH 0/3] libdrm/intel: Add support for Android Chad Versace
@ 2011-12-23 20:11 ` Chad Versace
2011-12-27 20:40 ` Eric Anholt
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
2 siblings, 1 reply; 16+ messages in thread
From: Chad Versace @ 2011-12-23 20:11 UTC (permalink / raw)
To: intel-gfx
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
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-23 20:11 ` [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android Chad Versace
@ 2011-12-27 20:40 ` Eric Anholt
2011-12-28 14:56 ` Eugeni Dodonov
0 siblings, 1 reply; 16+ messages in thread
From: Eric Anholt @ 2011-12-27 20:40 UTC (permalink / raw)
To: Chad Versace, intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 302 bytes --]
On Fri, 23 Dec 2011 12:11:10 -0800, Chad Versace <chad.versace@linux.intel.com> wrote:
> The function uses libpciaccess, which is not present on Android. So, make
> it a no-op that returns 0.
It's a bug that we're not using this function in mesa. How hard would
it be to get libpciaccess available?
[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-27 20:40 ` Eric Anholt
@ 2011-12-28 14:56 ` Eugeni Dodonov
2011-12-28 15:11 ` Purushothaman, Vijay A
2011-12-29 0:45 ` Chad Versace
0 siblings, 2 replies; 16+ messages in thread
From: Eugeni Dodonov @ 2011-12-28 14:56 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 448 bytes --]
On Dec 27, 2011 6:41 PM, "Eric Anholt" <eric@anholt.net> wrote:
>
> On Fri, 23 Dec 2011 12:11:10 -0800, Chad Versace <
chad.versace@linux.intel.com> wrote:
> > The function uses libpciaccess, which is not present on Android. So,
make
> > it a no-op that returns 0.
>
> It's a bug that we're not using this function in mesa. How hard would
> it be to get libpciaccess available?
>
Not hard, but do we need it for anything else besides this part?
[-- Attachment #1.2: Type: text/html, Size: 655 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-28 14:56 ` Eugeni Dodonov
@ 2011-12-28 15:11 ` Purushothaman, Vijay A
2011-12-29 23:47 ` Chad Versace
2011-12-29 0:45 ` Chad Versace
1 sibling, 1 reply; 16+ messages in thread
From: Purushothaman, Vijay A @ 2011-12-28 15:11 UTC (permalink / raw)
To: 'eugeni@dodonov.net', 'eric@anholt.net'
Cc: 'intel-gfx@lists.freedesktop.org'
[-- Attachment #1.1: Type: text/plain, Size: 980 bytes --]
You need libpciaccess in Android if you want to use intel-gpu-tools in Android. We have already ported these tools to work in Android.
Thanks,
Vijay
From: Eugeni Dodonov [mailto:eugeni@dodonov.net]
Sent: Wednesday, December 28, 2011 10:56 PM
To: Eric Anholt <eric@anholt.net>
Cc: intel-gfx@lists.freedesktop.org <intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
On Dec 27, 2011 6:41 PM, "Eric Anholt" <eric@anholt.net<mailto:eric@anholt.net>> wrote:
>
> On Fri, 23 Dec 2011 12:11:10 -0800, Chad Versace <chad.versace@linux.intel.com<mailto:chad.versace@linux.intel.com>> wrote:
> > The function uses libpciaccess, which is not present on Android. So, make
> > it a no-op that returns 0.
>
> It's a bug that we're not using this function in mesa. How hard would
> it be to get libpciaccess available?
>
Not hard, but do we need it for anything else besides this part?
[-- Attachment #1.2: Type: text/html, Size: 1636 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-28 15:11 ` Purushothaman, Vijay A
@ 2011-12-29 23:47 ` Chad Versace
2011-12-30 5:13 ` Purushothaman, Vijay A
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Chad Versace @ 2011-12-29 23:47 UTC (permalink / raw)
To: Purushothaman, Vijay A; +Cc: 'intel-gfx@lists.freedesktop.org'
On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
> You need libpciaccess in Android if you want to use intel-gpu-tools in Android. We have already ported these tools to work in Android.
>
> Thanks,
> Vijay
Vijay, please share the source for your Android ports of libpciaccess and intel-gpu-tools. We should try to avoid duplication of effort here.
Chad
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-29 23:47 ` Chad Versace
@ 2011-12-30 5:13 ` Purushothaman, Vijay A
2012-05-09 7:33 ` iyshwarya
2012-05-09 7:35 ` Engineer
2 siblings, 0 replies; 16+ messages in thread
From: Purushothaman, Vijay A @ 2011-12-30 5:13 UTC (permalink / raw)
To: Chad Versace; +Cc: 'intel-gfx@lists.freedesktop.org'
Chad,
I was under the impression that your team already have access to our internal tools - I believe at least Jesse has access.
I will make sure to include you folks in our release notices. We are planning to upstream the changes in a week. For time being I will send you a copy.
Thanks,
Vijay
> -----Original Message-----
> From: Chad Versace [mailto:chad.versace@linux.intel.com]
> Sent: Friday, December 30, 2011 5:17 AM
> To: Purushothaman, Vijay A
> Cc: 'eugeni@dodonov.net'; 'eric@anholt.net'; 'intel-
> gfx@lists.freedesktop.org'
> Subject: Re: [Intel-gfx] [PATCH 1/3] intel: Disable
> drm_intel_probe_agp_aperture_size() on Android
>
> On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
> > You need libpciaccess in Android if you want to use intel-gpu-tools in
> Android. We have already ported these tools to work in Android.
> >
> > Thanks,
> > Vijay
>
> Vijay, please share the source for your Android ports of libpciaccess and
> intel-gpu-tools. We should try to avoid duplication of effort here.
>
> Chad
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
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 7:35 ` Engineer
2 siblings, 1 reply; 16+ messages in thread
From: iyshwarya @ 2012-05-09 7:33 UTC (permalink / raw)
To: intel-gfx
Chad Versace <chad.versace <at> linux.intel.com> writes:
>
> On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
> > You need libpciaccess in Android if you want to use intel-gpu-tools in
Android. We have already ported
> these tools to work in Android.
> >
> > Thanks,
> > Vijay
>
> Vijay, please share the source for your Android ports of libpciaccess and
intel-gpu-tools. We should try
> to avoid duplication of effort here.
>
> Chad
>
hi vijay,
Do post the source code of libpciaccess android porting as we face
issues with the porting of libpciaccess with android.
Thanks
Iyshwarya
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2012-05-09 7:33 ` iyshwarya
@ 2012-05-09 9:11 ` Sateesh Kavuri
2012-05-09 10:11 ` Sateesh Kavuri
0 siblings, 1 reply; 16+ messages in thread
From: Sateesh Kavuri @ 2012-05-09 9:11 UTC (permalink / raw)
To: intel-gfx, daniel.vetter
Daniel,
I sent the patch for intel-gpu-tools port to Android and I remember you
mentioning that it is merged. But I do not see my patches in the
intel-gpu-tools git repo.
Have the patches been merged?
--
Sateesh
On 05/09/2012 01:03 PM, iyshwarya wrote:
> Chad Versace<chad.versace<at> linux.intel.com> writes:
>
>> On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
>>> You need libpciaccess in Android if you want to use intel-gpu-tools in
> Android. We have already ported
>> these tools to work in Android.
>>> Thanks,
>>> Vijay
>> Vijay, please share the source for your Android ports of libpciaccess and
> intel-gpu-tools. We should try
>> to avoid duplication of effort here.
>>
>> Chad
>>
> hi vijay,
>
> Do post the source code of libpciaccess android porting as we face
> issues with the porting of libpciaccess with android.
>
> Thanks
> Iyshwarya
>
>
>
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2012-05-09 9:11 ` Sateesh Kavuri
@ 2012-05-09 10:11 ` Sateesh Kavuri
2012-05-09 19:46 ` Daniel Vetter
0 siblings, 1 reply; 16+ messages in thread
From: Sateesh Kavuri @ 2012-05-09 10:11 UTC (permalink / raw)
To: sateesh.kavuri; +Cc: daniel.vetter, intel-gfx
The repository hosted at git.debian.org does not have my changes, but the
one at freedesktop does. Which is the maintained repo?
apt-get source prints the repository being at
git://git.debian.org/git/pkg-xorg/app/intel-gpu-tools.git
--
Sateesh
On 05/09/2012 02:41 PM, Sateesh Kavuri wrote:
> Daniel,
> I sent the patch for intel-gpu-tools port to Android and I remember you
> mentioning that it is merged. But I do not see my patches in the
> intel-gpu-tools git repo.
>
> Have the patches been merged?
>
> --
> Sateesh
>
> On 05/09/2012 01:03 PM, iyshwarya wrote:
>> Chad Versace<chad.versace<at> linux.intel.com> writes:
>>
>>> On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
>>>> You need libpciaccess in Android if you want to use intel-gpu-tools in
>> Android. We have already ported
>>> these tools to work in Android.
>>>> Thanks,
>>>> Vijay
>>> Vijay, please share the source for your Android ports of libpciaccess and
>> intel-gpu-tools. We should try
>>> to avoid duplication of effort here.
>>>
>>> Chad
>>>
>> hi vijay,
>>
>> Do post the source code of libpciaccess android porting as we face
>> issues with the porting of libpciaccess with android.
>>
>> Thanks
>> Iyshwarya
>>
>>
>>
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2012-05-09 10:11 ` Sateesh Kavuri
@ 2012-05-09 19:46 ` Daniel Vetter
0 siblings, 0 replies; 16+ messages in thread
From: Daniel Vetter @ 2012-05-09 19:46 UTC (permalink / raw)
To: Sateesh Kavuri; +Cc: daniel.vetter, intel-gfx
On Wed, May 09, 2012 at 03:41:27PM +0530, Sateesh Kavuri wrote:
> The repository hosted at git.debian.org does not have my changes, but the
> one at freedesktop does. Which is the maintained repo?
>
> apt-get source prints the repository being at
> git://git.debian.org/git/pkg-xorg/app/intel-gpu-tools.git
That's the wrong one, i-g-t is at fdo since quite a while.
-Daniel
>
> --
> Sateesh
>
> On 05/09/2012 02:41 PM, Sateesh Kavuri wrote:
> >Daniel,
> >I sent the patch for intel-gpu-tools port to Android and I remember you
> >mentioning that it is merged. But I do not see my patches in the
> >intel-gpu-tools git repo.
> >
> >Have the patches been merged?
> >
> >--
> >Sateesh
> >
> >On 05/09/2012 01:03 PM, iyshwarya wrote:
> >>Chad Versace<chad.versace<at> linux.intel.com> writes:
> >>
> >>>On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
> >>>>You need libpciaccess in Android if you want to use intel-gpu-tools in
> >>Android. We have already ported
> >>>these tools to work in Android.
> >>>>Thanks,
> >>>>Vijay
> >>>Vijay, please share the source for your Android ports of libpciaccess and
> >>intel-gpu-tools. We should try
> >>>to avoid duplication of effort here.
> >>>
> >>>Chad
> >>>
> >>hi vijay,
> >>
> >> Do post the source code of libpciaccess android porting as we face
> >>issues with the porting of libpciaccess with android.
> >>
> >>Thanks
> >>Iyshwarya
> >>
> >>
> >>
> >>
> >>_______________________________________________
> >>Intel-gfx mailing list
> >>Intel-gfx@lists.freedesktop.org
> >>http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
>
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-29 23:47 ` Chad Versace
2011-12-30 5:13 ` Purushothaman, Vijay A
2012-05-09 7:33 ` iyshwarya
@ 2012-05-09 7:35 ` Engineer
2012-05-09 8:20 ` Purushothaman, Vijay A
2 siblings, 1 reply; 16+ messages in thread
From: Engineer @ 2012-05-09 7:35 UTC (permalink / raw)
To: intel-gfx
Chad Versace <chad.versace <at> linux.intel.com> writes:
>
> On 12/28/2011 07:11 AM, Purushothaman, Vijay A wrote:
> > You need libpciaccess in Android if you want to use intel-gpu-tools in
Android. We have already ported
> these tools to work in Android.
> >
> > Thanks,
> > Vijay
>
> Vijay, please share the source for your Android ports of libpciaccess and
intel-gpu-tools. We should try
> to avoid duplication of effort here.
>
> Chad
>
We need to run the intel gpu tools test in Android(ICS). As you have said
here ,we require the libpciaccess for the intel GPU tools tests to be run in
Android. I have not found any method so far as how to put the libpciaccess
into Android. Can u help us on this ASAP?
Thanks,
Engineer
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2012-05-09 7:35 ` Engineer
@ 2012-05-09 8:20 ` Purushothaman, Vijay A
0 siblings, 0 replies; 16+ messages in thread
From: Purushothaman, Vijay A @ 2012-05-09 8:20 UTC (permalink / raw)
To: Engineer, intel-gfx@lists.freedesktop.org
>
> We need to run the intel gpu tools test in Android(ICS). As you have said here
> ,we require the libpciaccess for the intel GPU tools tests to be run in Android. I
> have not found any method so far as how to put the libpciaccess into Android.
> Can u help us on this ASAP?
>
I remember seeing a patch from Sateesh for porting intel-gpu-tools and libpciaccess.
I will request him to resend the patch.
Thanks,
Vijay
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android
2011-12-28 14:56 ` Eugeni Dodonov
2011-12-28 15:11 ` Purushothaman, Vijay A
@ 2011-12-29 0:45 ` Chad Versace
1 sibling, 0 replies; 16+ messages in thread
From: Chad Versace @ 2011-12-29 0:45 UTC (permalink / raw)
To: Eugeni Dodonov; +Cc: intel-gfx
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12/28/2011 06:56 AM, Eugeni Dodonov wrote:
>
> On Dec 27, 2011 6:41 PM, "Eric Anholt" <eric@anholt.net <mailto:eric@anholt.net>> wrote:
>>
>> On Fri, 23 Dec 2011 12:11:10 -0800, Chad Versace <chad.versace@linux.intel.com <mailto:chad.versace@linux.intel.com>> wrote:
>> > The function uses libpciaccess, which is not present on Android. So, make
>> > it a no-op that returns 0.
>>
>> It's a bug that we're not using this function in mesa. How hard would
>> it be to get libpciaccess available?
>>
>
> Not hard, but do we need it for anything else besides this part?
>
We only need it for this one function.
I haven't looked into how hard it would be yet. It's on my todo list for Thursday to try to squeeze it into the Android build.
- ----
Chad Versace
chad.versace@linux.intel.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJO+7gmAAoJEAIvNt057x8ipYwQAKKlAtQDdDFMRElz3qBAZ/8Z
L1FdVbWF6tIqg/0hDxbZxUw/8sENL86dg7kJr/Gbc4zU9inyE4h/6zYr6ZU7PsLg
UDk/SPvzqScCCrwHwbXHb4S+X7OXb5NTTO8BK8D8vzcIrLanW6+dOTayJfXLQBtw
t0C9hClvRnmP1ZPLF7PY9AG2A2OnMzhOYBTgdyIZY6YgOVPWtITjgJFQz/d4zx5E
akjTNJ5WAycwHhfj9Uc5LwApEfpaIx/Leb4pr77bCz8i/Eu8/kJd5CkzQ+Kn76Wn
rbdyAi9Vx3OtE4WS58R46Q77T0gLoqoSWgKQ246XQkjB3Mp0daY2E3EKxgS1/Dhi
AqdGE63SdjWpUiZe1J5yUCl/iD1SPTL72ESBAlUMkvdkt5+BOcj+yy8ZdfZ2jMaH
EqWbEOrXyqIN2uqsCgRKwO4xYEH/Kv8Cw/32JdF+d2EDqRutli9Q2wAMFDGzZy0n
DAtY3c9KsfBY8vDkVCjs7eX7yAYaJIr5hJN9d9wO4mE5ZNYtJMUP1ADgHdNEeuaL
OKOPb6mK7DAG9FPeuEM70/8Dq0NaxIhaR2lbFj5bSu9EVKIyC7+HiVYNjiXZVibB
bML3FbX1iThGStStPJzio1wwQ2J1y2uQH78SM9wZX5CYlKKcooig4hQOh1/CDFIK
oKAIwSnWpq9RH0HiQmlu
=t3DY
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/3] libdrm,intel: Factor source file lists into sources.mk
2011-12-23 20:11 [PATCH 0/3] libdrm/intel: Add support for Android Chad Versace
2011-12-23 20:11 ` [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android Chad Versace
@ 2011-12-23 20:11 ` Chad Versace
2011-12-23 20:11 ` [PATCH 3/3] libdrm,intel: Add Android makefiles Chad Versace
2 siblings, 0 replies; 16+ messages in thread
From: Chad Versace @ 2011-12-23 20:11 UTC (permalink / raw)
To: intel-gfx
Factor the source file list for libdrm.so from Makefile.am into
sources.mk. Ditto for libdrm_intel.so.
This is in preparation for adding support for Android. The sources.mk's
will be shared between autotools and Android.
Rationale: The most commonly changed parts of any makefile are the source
lists. So, by sharing the lists between the two build systems, we can
reduce the frequency at which modifications to the Linux build breaks the
Android build.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
---
Makefile.am | 9 ++++-----
intel/Makefile.am | 8 ++++----
intel/sources.mk | 29 +++++++++++++++++++++++++++++
sources.mk | 30 ++++++++++++++++++++++++++++++
4 files changed, 67 insertions(+), 9 deletions(-)
create mode 100644 intel/sources.mk
create mode 100644 sources.mk
diff --git a/Makefile.am b/Makefile.am
index a4d07f4..b62287c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,9 @@ if HAVE_RADEON
RADEON_SUBDIR = radeon
endif
+# Import variable LIBDRM_SOURCES.
+include sources.mk
+
SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests include
libdrm_la_LTLIBRARIES = libdrm.la
@@ -51,11 +54,7 @@ libdrm_la_LIBADD = @CLOCK_LIB@
libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
libdrm_la_SOURCES = \
- xf86drm.c \
- xf86drmHash.c \
- xf86drmRandom.c \
- xf86drmSL.c \
- xf86drmMode.c \
+ $(LIBDRM_SOURCES) \
xf86atomic.h \
libdrm_lists.h
diff --git a/intel/Makefile.am b/intel/Makefile.am
index 7a44aaf..11f0b97 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -22,6 +22,9 @@
# Authors:
# Eric Anholt <eric@anholt.net>
+# Import variable LIBDRM_INTEL_SOURCES.
+include sources.mk
+
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
@@ -36,12 +39,9 @@ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \
- intel_bufmgr.c \
+ $(LIBDRM_INTEL_SOURCES) \
intel_bufmgr_priv.h \
- intel_bufmgr_fake.c \
- intel_bufmgr_gem.c \
intel_chipset.h \
- mm.c \
mm.h
libdrm_intelincludedir = ${includedir}/libdrm
diff --git a/intel/sources.mk b/intel/sources.mk
new file mode 100644
index 0000000..24cba76
--- /dev/null
+++ b/intel/sources.mk
@@ -0,0 +1,29 @@
+#
+# Copyright © 2011 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+
+# for libdrm_intel.so
+LIBDRM_INTEL_SOURCES := \
+ intel_bufmgr.c \
+ intel_bufmgr_fake.c \
+ intel_bufmgr_gem.c \
+ mm.c
diff --git a/sources.mk b/sources.mk
new file mode 100644
index 0000000..3d54e7e
--- /dev/null
+++ b/sources.mk
@@ -0,0 +1,30 @@
+#
+# Copyright © 2011 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+
+# for libdrm.so
+LIBDRM_SOURCES := \
+ xf86drm.c \
+ xf86drmHash.c \
+ xf86drmRandom.c \
+ xf86drmSL.c \
+ xf86drmMode.c
--
1.7.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 3/3] libdrm,intel: Add Android makefiles
2011-12-23 20:11 [PATCH 0/3] libdrm/intel: Add support for Android Chad Versace
2011-12-23 20:11 ` [PATCH 1/3] intel: Disable drm_intel_probe_agp_aperture_size() on Android 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 ` Chad Versace
2 siblings, 0 replies; 16+ messages in thread
From: Chad Versace @ 2011-12-23 20:11 UTC (permalink / raw)
To: intel-gfx
This enables libdrm.so and libdrm_intel.so to build on Android
IceCreamSandwich.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
---
Android.mk | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
intel/Android.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 0 deletions(-)
create mode 100644 Android.mk
create mode 100644 intel/Android.mk
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..1029dc6
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,52 @@
+#
+# Copyright © 2011 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+
+LIBDRM_VALID_GPU_DRIVERS := i915 i965
+
+# Skip this makefile if we're not building for a known GPU.
+ifneq ($(filter $(BOARD_GPU_DRIVERS), $(LIBDRM_VALID_GPU_DRIVERS)),)
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LIBDRM_TOP := $(LOCAL_PATH)
+
+# Import variable LIBDRM_SOURCES.
+include $(LOCAL_PATH)/sources.mk
+
+LOCAL_MODULE := libdrm
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(LIBDRM_SOURCES)
+
+LOCAL_C_INCLUDES := \
+ $(LIBDRM_TOP)/include/drm
+
+LOCAL_CFLAGS := \
+ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/intel/Android.mk
+
+endif # BOARD_GPU_DRIVERS
diff --git a/intel/Android.mk b/intel/Android.mk
new file mode 100644
index 0000000..b3459c0
--- /dev/null
+++ b/intel/Android.mk
@@ -0,0 +1,49 @@
+#
+# Copyright © 2011 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+
+LIBDRM_INTEL_VALID_GPU_DRIVERS := i915 i965
+
+# Skip this makefile if we're not building for an Intel GPU.
+ifneq ($(filter $(BOARD_GPU_DRIVERS), $(LIBDRM_INTEL_VALID_GPU_DRIVERS)),)
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# Import variable LIBDRM_INTEL_SOURCES.
+include $(LOCAL_PATH)/sources.mk
+
+LOCAL_MODULE := libdrm_intel
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SHARED_LIBRARIES := libdrm
+
+LOCAL_SRC_FILES := $(LIBDRM_INTEL_SOURCES)
+
+LOCAL_C_INCLUDES := \
+ $(LIBDRM_TOP) \
+ $(LIBDRM_TOP)/intel \
+ $(LIBDRM_TOP)/include/drm
+
+include $(BUILD_SHARED_LIBRARY)
+
+endif # BOARD_GPU_DRIVERS
--
1.7.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread