Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-08-03 Thread Dave Gordon 

On 17/07/15 09:53, Morton, Derek J wrote:



-Original Message-
From: Morton, Derek J
Sent: Friday, July 17, 2015 9:44 AM
To: intel-gfx@lists.freedesktop.org
Cc: Wood, Thomas; Morton, Derek J
Subject: [PATCH i-g-t v3] Android.mk: Disable tools that do not build for 
android

Disable the tools / demo code that do not currently build for android until 
they can be fixed.

Affected tools / demos
intel_display_crc
intel_sprite_on

v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO flag.
v3: removed intel_reg from the skip list as Thomas has prepared a patch to fix 
it for Android.

Signed-off-by: Derek Morton derek.j.mor...@intel.com
---
Android.mk   | 2 +-
tools/Android.mk | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 1ab3e64..681d114 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools benchmarks demos)
+include $(call all-named-subdir-makefiles, lib tests tools benchmarks)

diff --git a/tools/Android.mk b/tools/Android.mk index 39f4512..4be0032 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -37,10 +37,15 @@ endef

skip_tools_list := \
 intel_framebuffer_dump \
+intel_reg \


That's weird, git diff HEAD^ shows this being removed but git format-patch 
HEAD^ has left it in.


The relevant man pages say:

   git diff [--options] commit [--] [path...]
   This form is to view the changes you have in your working 
tree relative to the named commit. You can use HEAD to compare it with 
the latest commit, or a branch name to compare with the tip of a 
different branch.


  git format-patch [-k] [(-o|--output-directory) dir | --stdout]
...
[common diff options]
[ since | revision range ]

So git format-patch HEAD^ is describing the changes between HEAD^ and 
HEAD i.e. 'since' == HEAD^, equivalent to revision range HEAD^..HEAD


Whereas git diff HEAD^ is comparing the commit referenced by HEAD^ 
with the current working tree (which might differ from HEAD). They'll be 
different if you have uncommitted changes in your working tree!


.Dave.

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-21 Thread Daniel Vetter 
On Fri, Jul 17, 2015 at 03:42:34PM +, Morton, Derek J wrote:
 
 
 -Original Message-
 From: Thomas Wood [mailto:thomas.w...@intel.com] 
 Sent: Friday, July 17, 2015 3:18 PM
 To: Morton, Derek J
 Cc: Intel Graphics Development
 Subject: Re: [PATCH i-g-t v3] Android.mk: Disable tools that do not build 
 for android
 
 On 17 July 2015 at 10:15, Derek Morton derek.j.mor...@intel.com wrote:
  Disable the tools / demo code that do not currently build for android 
  until they can be fixed.
 
  Affected tools / demos
  intel_display_crc
  intel_sprite_on
 
  v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO 
  flag.
  v3: removed intel_reg from the skip list as Thomas has prepared a 
  patch to fix it for Android.
 
  Signed-off-by: Derek Morton derek.j.mor...@intel.com
  ---
   Android.mk   | 2 +-
   tools/Android.mk | 4 
   2 files changed, 5 insertions(+), 1 deletion(-)
 
  diff --git a/Android.mk b/Android.mk
  index 1ab3e64..681d114 100644
  --- a/Android.mk
  +++ b/Android.mk
  @@ -1,2 +1,2 @@
  -include $(call all-named-subdir-makefiles, lib tests tools benchmarks 
  demos)
  +include $(call all-named-subdir-makefiles, lib tests tools 
  +benchmarks)
 
 This essentially just disables building intel_sprite_on. Does the comment in 
 commit 6999b70 no longer apply?
 
 With this patch the IGT automatic build test would not need to apply the 
 patch referred to in commit 6999b70. That local patch would still be required 
 by anyone wishing to build intel_sprite_on for android.
 
 This patch is aimed at reducing friction by making the vanilla IGT code build 
 for android as the local patch referred to is not considered upstreamable.

Then just please remove intel_sprite_on - that tool is only in igt because
android teams have written it, on upstream we have piles of proper igt
testcases. No point in carrying around dead code.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-21 Thread Gore, Tim 


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


 -Original Message-
 From: Intel-gfx [mailto:intel-gfx-boun...@lists.freedesktop.org] On Behalf
 Of Daniel Vetter
 Sent: Tuesday, July 21, 2015 7:54 AM
 To: Morton, Derek J
 Cc: Intel Graphics Development; Wood, Thomas
 Subject: Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do 
 not
 build for android
 
 On Fri, Jul 17, 2015 at 03:42:34PM +, Morton, Derek J wrote:
  
  
  -Original Message-
  From: Thomas Wood [mailto:thomas.w...@intel.com]
  Sent: Friday, July 17, 2015 3:18 PM
  To: Morton, Derek J
  Cc: Intel Graphics Development
  Subject: Re: [PATCH i-g-t v3] Android.mk: Disable tools that do not
  build for android
  
  On 17 July 2015 at 10:15, Derek Morton derek.j.mor...@intel.com
 wrote:
   Disable the tools / demo code that do not currently build for
   android until they can be fixed.
  
   Affected tools / demos
   intel_display_crc
   intel_sprite_on
  
   v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO
   flag.
   v3: removed intel_reg from the skip list as Thomas has prepared a
   patch to fix it for Android.
  
   Signed-off-by: Derek Morton derek.j.mor...@intel.com
   ---
Android.mk   | 2 +-
tools/Android.mk | 4 
2 files changed, 5 insertions(+), 1 deletion(-)
  
   diff --git a/Android.mk b/Android.mk index 1ab3e64..681d114 100644
   --- a/Android.mk
   +++ b/Android.mk
   @@ -1,2 +1,2 @@
   -include $(call all-named-subdir-makefiles, lib tests tools
   benchmarks
   demos)
   +include $(call all-named-subdir-makefiles, lib tests tools
   +benchmarks)
  
  This essentially just disables building intel_sprite_on. Does the comment
 in commit 6999b70 no longer apply?
  
  With this patch the IGT automatic build test would not need to apply the
 patch referred to in commit 6999b70. That local patch would still be required
 by anyone wishing to build intel_sprite_on for android.
 
  This patch is aimed at reducing friction by making the vanilla IGT code 
  build
 for android as the local patch referred to is not considered upstreamable.
 
 Then just please remove intel_sprite_on - that tool is only in igt because
 android teams have written it, on upstream we have piles of proper igt
 testcases. No point in carrying around dead code.
 -Daniel
 --

I don’t think this code is dead, it just uses some features which require
a tweak when building for android. (I believe it builds fine for linux).
Its not really intended to be a test I don’t think, just a quick sanity check
that the basics are there.

  Tim

 Daniel Vetter
 Software Engineer, Intel Corporation
 http://blog.ffwll.ch
 ___
 Intel-gfx mailing list
 Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-21 Thread Morton, Derek J 


-Original Message-
From: Daniel Vetter [mailto:daniel.vet...@ffwll.ch] On Behalf Of Daniel Vetter
Sent: Tuesday, July 21, 2015 7:54 AM
To: Morton, Derek J
Cc: Wood, Thomas; Intel Graphics Development
Subject: Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do 
not build for android

On Fri, Jul 17, 2015 at 03:42:34PM +, Morton, Derek J wrote:
 
 
 -Original Message-
 From: Thomas Wood [mailto:thomas.w...@intel.com]
 Sent: Friday, July 17, 2015 3:18 PM
 To: Morton, Derek J
 Cc: Intel Graphics Development
 Subject: Re: [PATCH i-g-t v3] Android.mk: Disable tools that do not 
 build for android
 
 On 17 July 2015 at 10:15, Derek Morton derek.j.mor...@intel.com wrote:
  Disable the tools / demo code that do not currently build for 
  android until they can be fixed.
 
  Affected tools / demos
  intel_display_crc
  intel_sprite_on
 
  v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO 
  flag.
  v3: removed intel_reg from the skip list as Thomas has prepared a 
  patch to fix it for Android.
 
  Signed-off-by: Derek Morton derek.j.mor...@intel.com
  ---
   Android.mk   | 2 +-
   tools/Android.mk | 4 
   2 files changed, 5 insertions(+), 1 deletion(-)
 
  diff --git a/Android.mk b/Android.mk index 1ab3e64..681d114 100644
  --- a/Android.mk
  +++ b/Android.mk
  @@ -1,2 +1,2 @@
  -include $(call all-named-subdir-makefiles, lib tests tools 
  benchmarks
  demos)
  +include $(call all-named-subdir-makefiles, lib tests tools
  +benchmarks)
 
 This essentially just disables building intel_sprite_on. Does the comment 
 in commit 6999b70 no longer apply?
 
 With this patch the IGT automatic build test would not need to apply the 
 patch referred to in commit 6999b70. That local patch would still be 
 required by anyone wishing to build intel_sprite_on for android.
 
 This patch is aimed at reducing friction by making the vanilla IGT code 
 build for android as the local patch referred to is not considered 
 upstreamable.

Then just please remove intel_sprite_on - that tool is only in igt because 
android teams have written it, on upstream we have piles of proper igt 
testcases. No point in carrying around dead code.

The code is not dead. It is just dependant on a patch which cannot be 
upstreamed. When that patch is applied locally it builds and runs fine. As 
intel_sprite_on does not build for android without the patch it needs to be 
disabled by default as cairo dependant tests are also disabled.

-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-17 Thread Thomas Wood 
On 17 July 2015 at 10:15, Derek Morton derek.j.mor...@intel.com wrote:
 Disable the tools / demo code that do not currently build
 for android until they can be fixed.

 Affected tools / demos
 intel_display_crc
 intel_sprite_on

 v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO
 flag.
 v3: removed intel_reg from the skip list as Thomas has prepared
 a patch to fix it for Android.

 Signed-off-by: Derek Morton derek.j.mor...@intel.com
 ---
  Android.mk   | 2 +-
  tools/Android.mk | 4 
  2 files changed, 5 insertions(+), 1 deletion(-)

 diff --git a/Android.mk b/Android.mk
 index 1ab3e64..681d114 100644
 --- a/Android.mk
 +++ b/Android.mk
 @@ -1,2 +1,2 @@
 -include $(call all-named-subdir-makefiles, lib tests tools benchmarks demos)
 +include $(call all-named-subdir-makefiles, lib tests tools benchmarks)

This essentially just disables building intel_sprite_on. Does the
comment in commit 6999b70 no longer apply?



 diff --git a/tools/Android.mk b/tools/Android.mk
 index 39f4512..b5f8008 100644
 --- a/tools/Android.mk
 +++ b/tools/Android.mk
 @@ -41,6 +41,10 @@ skip_tools_list := \
  intel_vga_read \
  intel_vga_write

 +ifneq (${ANDROID_HAS_CAIRO}, 1)
 +skip_tools_list += intel_display_crc
 +endif
 +
  tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))

  $(foreach item,$(tools_list),$(eval $(call add_tool,$(item
 --
 1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-17 Thread Morton, Derek J 


-Original Message-
From: Morton, Derek J 
Sent: Friday, July 17, 2015 9:44 AM
To: intel-gfx@lists.freedesktop.org
Cc: Wood, Thomas; Morton, Derek J
Subject: [PATCH i-g-t v3] Android.mk: Disable tools that do not build for 
android

Disable the tools / demo code that do not currently build for android until 
they can be fixed.

Affected tools / demos
intel_display_crc
intel_sprite_on

v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO flag.
v3: removed intel_reg from the skip list as Thomas has prepared a patch to fix 
it for Android.

Signed-off-by: Derek Morton derek.j.mor...@intel.com
---
 Android.mk   | 2 +-
 tools/Android.mk | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 1ab3e64..681d114 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools benchmarks demos)
+include $(call all-named-subdir-makefiles, lib tests tools benchmarks)
 
diff --git a/tools/Android.mk b/tools/Android.mk index 39f4512..4be0032 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -37,10 +37,15 @@ endef
 
 skip_tools_list := \
 intel_framebuffer_dump \
+intel_reg \

That's weird, git diff HEAD^ shows this being removed but git format-patch 
HEAD^ has left it in.

 intel_reg_dumper \
 intel_vga_read \
 intel_vga_write
 
+ifneq (${ANDROID_HAS_CAIRO}, 1)
+skip_tools_list += intel_display_crc endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item
--
1.9.1


___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-17 Thread Derek Morton 
Disable the tools / demo code that do not currently build
for android until they can be fixed.

Affected tools / demos
intel_display_crc
intel_sprite_on

v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO
flag.
v3: removed intel_reg from the skip list as Thomas has prepared
a patch to fix it for Android.

Signed-off-by: Derek Morton derek.j.mor...@intel.com
---
 Android.mk   | 2 +-
 tools/Android.mk | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 1ab3e64..681d114 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools benchmarks demos)
+include $(call all-named-subdir-makefiles, lib tests tools benchmarks)
 
diff --git a/tools/Android.mk b/tools/Android.mk
index 39f4512..b5f8008 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -41,6 +41,10 @@ skip_tools_list := \
 intel_vga_read \
 intel_vga_write
 
+ifneq (${ANDROID_HAS_CAIRO}, 1)
+skip_tools_list += intel_display_crc
+endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-17 Thread Derek Morton 
Disable the tools / demo code that do not currently build
for android until they can be fixed.

Affected tools / demos
intel_display_crc
intel_sprite_on

v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO
flag.
v3: removed intel_reg from the skip list as Thomas has prepared
a patch to fix it for Android.

Signed-off-by: Derek Morton derek.j.mor...@intel.com
---
 Android.mk   | 2 +-
 tools/Android.mk | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 1ab3e64..681d114 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools benchmarks demos)
+include $(call all-named-subdir-makefiles, lib tests tools benchmarks)
 
diff --git a/tools/Android.mk b/tools/Android.mk
index 39f4512..4be0032 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -37,10 +37,15 @@ endef
 
 skip_tools_list := \
 intel_framebuffer_dump \
+intel_reg \
 intel_reg_dumper \
 intel_vga_read \
 intel_vga_write
 
+ifneq (${ANDROID_HAS_CAIRO}, 1)
+skip_tools_list += intel_display_crc
+endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

2015-07-17 Thread Morton, Derek J 


-Original Message-
From: Thomas Wood [mailto:thomas.w...@intel.com] 
Sent: Friday, July 17, 2015 3:18 PM
To: Morton, Derek J
Cc: Intel Graphics Development
Subject: Re: [PATCH i-g-t v3] Android.mk: Disable tools that do not build for 
android

On 17 July 2015 at 10:15, Derek Morton derek.j.mor...@intel.com wrote:
 Disable the tools / demo code that do not currently build for android 
 until they can be fixed.

 Affected tools / demos
 intel_display_crc
 intel_sprite_on

 v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO 
 flag.
 v3: removed intel_reg from the skip list as Thomas has prepared a 
 patch to fix it for Android.

 Signed-off-by: Derek Morton derek.j.mor...@intel.com
 ---
  Android.mk   | 2 +-
  tools/Android.mk | 4 
  2 files changed, 5 insertions(+), 1 deletion(-)

 diff --git a/Android.mk b/Android.mk
 index 1ab3e64..681d114 100644
 --- a/Android.mk
 +++ b/Android.mk
 @@ -1,2 +1,2 @@
 -include $(call all-named-subdir-makefiles, lib tests tools benchmarks 
 demos)
 +include $(call all-named-subdir-makefiles, lib tests tools 
 +benchmarks)

This essentially just disables building intel_sprite_on. Does the comment in 
commit 6999b70 no longer apply?

With this patch the IGT automatic build test would not need to apply the patch 
referred to in commit 6999b70. That local patch would still be required by 
anyone wishing to build intel_sprite_on for android.

This patch is aimed at reducing friction by making the vanilla IGT code build 
for android as the local patch referred to is not considered upstreamable.

//Derek



 diff --git a/tools/Android.mk b/tools/Android.mk index 
 39f4512..b5f8008 100644
 --- a/tools/Android.mk
 +++ b/tools/Android.mk
 @@ -41,6 +41,10 @@ skip_tools_list := \
  intel_vga_read \
  intel_vga_write

 +ifneq (${ANDROID_HAS_CAIRO}, 1)
 +skip_tools_list += intel_display_crc endif
 +
  tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))

  $(foreach item,$(tools_list),$(eval $(call add_tool,$(item
 --
 1.9.1


___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx