Skip to contentSkip to conversation

gem_busy: Remove from android builds without cairo

PATCH In review Derek Morton 4 participants 7 messages Aug 23, 2016 – Aug 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 tests/Android.mk | 1 +
 1 file changed, 1 insertion(+)
tests/Android.mk +1 -0
index 3186a2a..74d6d47 100644
@@ -58,6 +58,7 @@ else
     gem_render_copy \
     pm_lpsp \
 	drm_read \
+	gem_busy \
 	gem_exec_blt \
 	prime_mmap_kms
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 14 lines · Derek Morton

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.

---
 tests/Android.mk | 1 +
 1 file changed, 1 insertion(+)
tests/Android.mk +0 -0
index 3186a2a..74d6d47 100644

tests/Android.mk else · line 63

Quoted 6 lines
tests/Android.mk +1 -0
@@ -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

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 19 lines

-----Original Message-----
From: Chris Wilson [mailto:[email protected]]
Sent: Tuesday, August 23, 2016 9:32 AM
To: Morton, Derek J <[email protected]>
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH i-g-t] gem_busy: Remove from android builds without cairo

Quoted 9 lines · Derek Morton

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.

---
 tests/Android.mk | 1 +
 1 file changed, 1 insertion(+)
Quoted 13 lines

tests/Android.mk else · line 63

Quoted 11 lines
tests/Android.mk index renamed from tests/Android.mk +0 -0

3186a2a..74d6d47 100644

tests/Android.mk +1 -0
@@ -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

Quoted 5 lines

-Chris

--
Chris Wilson, Intel Open Source Technology Centre

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#3 lore raw
In reply to Derek Morton

Tim Gore
Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ

Quoted 29 lines

-----Original Message-----
From: Morton, Derek J
Sent: Tuesday, August 23, 2016 9:28 AM
To: [email protected]
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.

---
 tests/Android.mk | 1 +
 1 file changed, 1 insertion(+)
tests/Android.mk index 3186a2a..74d6d47 renamed from tests/Android.mk +0 -0

100644

tests/Android.mk +1 -1
@@ -58,6 +58,7 @@ else
     gem_render_copy \
     pm_lpsp \
 	drm_read \
+	gem_busy \
 	gem_exec_blt \
 	prime_mmap_kms
 
--
Quoted 1 line

1.9.1

Works for me. IGT builds on Android with this patch (minus the offending test of course) No impact for linux

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

@Chris: I assume this is no longer necessary with the split to kms_busy?

Quoted 39 lines · Tim

Tim Gore
Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ

Quoted 29 lines

-----Original Message-----
From: Morton, Derek J
Sent: Tuesday, August 23, 2016 9:28 AM
To: [email protected]
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.

---
 tests/Android.mk | 1 +
 1 file changed, 1 insertion(+)
tests/Android.mk index 3186a2a..74d6d47 renamed from tests/Android.mk +0 -0

100644

tests/Android.mk +1 -1
@@ -58,6 +58,7 @@ else
     gem_render_copy \
     pm_lpsp \
 	drm_read \
+	gem_busy \
 	gem_exec_blt \
 	prime_mmap_kms
 
--
Quoted 1 line

1.9.1

Works for me. IGT builds on Android with this patch (minus the offending test of course) No impact for linux

Quoted 6 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
Quoted 1 line · Marius Vlad

@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

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

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:[email protected]]
Sent: Wednesday, August 24, 2016 2:47 PM
To: Gore, Tim <[email protected]>; Morton, Derek J <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [PATCH i-g-t] gem_busy: Remove from android builds without cairo

Quoted 1 line · Marius Vlad

@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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx