| Message ID | 1471940891-20021-1-git-send-email-derek.j.morton@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 23, 2016 at 09:28:11AM +0100, Derek Morton wrote: > The test has just developed cairo dependancies (or is at least now > dependant on igt_kms.h) so add it to the list of tests that are only > built if cairo is available. > > Signed-off-by: Derek Morton <derek.j.morton@intel.com> > --- > tests/Android.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/Android.mk b/tests/Android.mk > index 3186a2a..74d6d47 100644 > --- a/tests/Android.mk > +++ b/tests/Android.mk > @@ -58,6 +58,7 @@ else > gem_render_copy \ > pm_lpsp \ > drm_read \ > + gem_busy \ > gem_exec_blt \ > prime_mmap_kms Bleh. The GEM ABI checks are too important not to throw away, so kms_busy it is. -Chris
> > >-----Original Message----- >From: Chris Wilson [mailto:chris@chris-wilson.co.uk] >Sent: Tuesday, August 23, 2016 9:32 AM >To: Morton, Derek J <derek.j.morton@intel.com> >Cc: intel-gfx@lists.freedesktop.org >Subject: Re: [Intel-gfx] [PATCH i-g-t] gem_busy: Remove from android builds without cairo > >On Tue, Aug 23, 2016 at 09:28:11AM +0100, Derek Morton wrote: >> The test has just developed cairo dependancies (or is at least now >> dependant on igt_kms.h) so add it to the list of tests that are only >> built if cairo is available. >> >> Signed-off-by: Derek Morton <derek.j.morton@intel.com> >> --- >> tests/Android.mk | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/tests/Android.mk b/tests/Android.mk index >> 3186a2a..74d6d47 100644 >> --- a/tests/Android.mk >> +++ b/tests/Android.mk >> @@ -58,6 +58,7 @@ else >> gem_render_copy \ >> pm_lpsp \ >> drm_read \ >> + gem_busy \ >> gem_exec_blt \ >> prime_mmap_kms > >Bleh. The GEM ABI checks are too important not to throw away, so kms_busy it is. If you are going to rename the test kms_busy this patch will not be needed as all tests named kms_* are automatically treated as cairo dependant. //Derek >-Chris > >-- >Chris Wilson, Intel Open Source Technology Centre >
Tim Gore Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ > -----Original Message----- > From: Morton, Derek J > Sent: Tuesday, August 23, 2016 9:28 AM > To: intel-gfx@lists.freedesktop.org > Cc: Gore, Tim; Morton, Derek J > Subject: [PATCH i-g-t] gem_busy: Remove from android builds without cairo > > The test has just developed cairo dependancies (or is at least now > dependant on igt_kms.h) so add it to the list of tests that are only built if > cairo is available. > > Signed-off-by: Derek Morton <derek.j.morton@intel.com> > --- > tests/Android.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/Android.mk b/tests/Android.mk index 3186a2a..74d6d47 > 100644 > --- a/tests/Android.mk > +++ b/tests/Android.mk > @@ -58,6 +58,7 @@ else > gem_render_copy \ > pm_lpsp \ > drm_read \ > + gem_busy \ > gem_exec_blt \ > prime_mmap_kms > > -- > 1.9.1 Works for me. IGT builds on Android with this patch (minus the offending test of course) No impact for linux Reviewed-by: Tim Gore <tim.gore@intel.com>
@Chris: I assume this is no longer necessary with the split to kms_busy? On Tue, Aug 23, 2016 at 09:44:14AM +0000, Gore, Tim wrote: > > > Tim Gore > Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ > > > > -----Original Message----- > > From: Morton, Derek J > > Sent: Tuesday, August 23, 2016 9:28 AM > > To: intel-gfx@lists.freedesktop.org > > Cc: Gore, Tim; Morton, Derek J > > Subject: [PATCH i-g-t] gem_busy: Remove from android builds without cairo > > > > The test has just developed cairo dependancies (or is at least now > > dependant on igt_kms.h) so add it to the list of tests that are only built if > > cairo is available. > > > > Signed-off-by: Derek Morton <derek.j.morton@intel.com> > > --- > > tests/Android.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/tests/Android.mk b/tests/Android.mk index 3186a2a..74d6d47 > > 100644 > > --- a/tests/Android.mk > > +++ b/tests/Android.mk > > @@ -58,6 +58,7 @@ else > > gem_render_copy \ > > pm_lpsp \ > > drm_read \ > > + gem_busy \ > > gem_exec_blt \ > > prime_mmap_kms > > > > -- > > 1.9.1 > > Works for me. IGT builds on Android with this patch (minus the offending test of course) > No impact for linux > Reviewed-by: Tim Gore <tim.gore@intel.com> > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, Aug 24, 2016 at 04:25:06PM +0300, Marius Vlad wrote:
> @Chris: I assume this is no longer necessary with the split to kms_busy?
You probably want to change the gem_busy in this patch to kms_busy, so
that kms_busy doesn't get built without cairo?
-Chris
I put a rule in the android make file a while back that automatically adds any test starting kms_ to the cairo dependant list, so kms_busy will not need to be listed explicitly. //Derek -----Original Message----- From: Chris Wilson [mailto:chris@chris-wilson.co.uk] Sent: Wednesday, August 24, 2016 2:47 PM To: Gore, Tim <tim.gore@intel.com>; Morton, Derek J <derek.j.morton@intel.com>; intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH i-g-t] gem_busy: Remove from android builds without cairo On Wed, Aug 24, 2016 at 04:25:06PM +0300, Marius Vlad wrote: > @Chris: I assume this is no longer necessary with the split to kms_busy? You probably want to change the gem_busy in this patch to kms_busy, so that kms_busy doesn't get built without cairo? -Chris -- Chris Wilson, Intel Open Source Technology Centre
diff --git a/tests/Android.mk b/tests/Android.mk index 3186a2a..74d6d47 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -58,6 +58,7 @@ else gem_render_copy \ pm_lpsp \ drm_read \ + gem_busy \ gem_exec_blt \ prime_mmap_kms
The test has just developed cairo dependancies (or is at least now dependant on igt_kms.h) so add it to the list of tests that are only built if cairo is available. Signed-off-by: Derek Morton <derek.j.morton@intel.com> --- tests/Android.mk | 1 + 1 file changed, 1 insertion(+)