[i-g-t] lib: use the local intel_aub.h file
diff mbox

Message ID 20161026164839.22880-1-emil.l.velikov@gmail.com
State New
Headers show

Commit Message

Emil Velikov Oct. 26, 2016, 4:48 p.m. UTC
From: Emil Velikov <emil.velikov@collabora.com>

File is provided by the libdrm_intel package which is optional. Since we
already have a local copy of the file, we might as well use it ;-)

Cc: Brian Starkey <brian.starkey@arm.com>
Reported-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
An alternative would be to $ git mv tools/intel_aub.h lib/stubs/drm/ and
drop the intel_aub.h reference from tools/Makefile.am.
---
 lib/rendercopy_gen8.c | 2 +-
 lib/rendercopy_gen9.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel Vetter Oct. 27, 2016, 7:28 a.m. UTC | #1
On Wed, Oct 26, 2016 at 05:48:39PM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov@collabora.com>
> 
> File is provided by the libdrm_intel package which is optional. Since we
> already have a local copy of the file, we might as well use it ;-)
> 
> Cc: Brian Starkey <brian.starkey@arm.com>
> Reported-by: Brian Starkey <brian.starkey@arm.com>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
> ---
> An alternative would be to $ git mv tools/intel_aub.h lib/stubs/drm/ and
> drop the intel_aub.h reference from tools/Makefile.am.

Hm, that sounds like the approach with more consistency, but either
approach has my ack.
-Daniel


> ---
>  lib/rendercopy_gen8.c | 2 +-
>  lib/rendercopy_gen9.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
> index a7fc2c4..3c4a040 100644
> --- a/lib/rendercopy_gen8.c
> +++ b/lib/rendercopy_gen8.c
> @@ -22,7 +22,7 @@
>  #include "intel_reg.h"
>  #include "igt_aux.h"
>  
> -#include <intel_aub.h>
> +#include "tools/intel_aub.h"
>  
>  #define VERTEX_SIZE (3*4)
>  
> diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
> index 9537480..4fef584 100644
> --- a/lib/rendercopy_gen9.c
> +++ b/lib/rendercopy_gen9.c
> @@ -23,7 +23,7 @@
>  #include "intel_reg.h"
>  #include "igt_aux.h"
>  
> -#include <intel_aub.h>
> +#include "tools/intel_aub.h"
>  
>  #define VERTEX_SIZE (3*4)
>  
> -- 
> 2.9.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Brian Starkey Oct. 27, 2016, 8:44 a.m. UTC | #2
On Thu, Oct 27, 2016 at 09:28:12AM +0200, Daniel Vetter wrote:
>On Wed, Oct 26, 2016 at 05:48:39PM +0100, Emil Velikov wrote:
>> From: Emil Velikov <emil.velikov@collabora.com>
>>
>> File is provided by the libdrm_intel package which is optional. Since we
>> already have a local copy of the file, we might as well use it ;-)
>>
>> Cc: Brian Starkey <brian.starkey@arm.com>
>> Reported-by: Brian Starkey <brian.starkey@arm.com>
>> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
>> ---
>> An alternative would be to $ git mv tools/intel_aub.h lib/stubs/drm/ and
>> drop the intel_aub.h reference from tools/Makefile.am.
>
>Hm, that sounds like the approach with more consistency, but either
>approach has my ack.
>-Daniel
>

I agree that sounds better. I still needed to fix up
benchmarks/gem_exec_tracer.c on top of this patch - moving the header
would fix that and should avoid any more occurrences.

-Brian

>
>> ---
>>  lib/rendercopy_gen8.c | 2 +-
>>  lib/rendercopy_gen9.c | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
>> index a7fc2c4..3c4a040 100644
>> --- a/lib/rendercopy_gen8.c
>> +++ b/lib/rendercopy_gen8.c
>> @@ -22,7 +22,7 @@
>>  #include "intel_reg.h"
>>  #include "igt_aux.h"
>>
>> -#include <intel_aub.h>
>> +#include "tools/intel_aub.h"
>>
>>  #define VERTEX_SIZE (3*4)
>>
>> diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
>> index 9537480..4fef584 100644
>> --- a/lib/rendercopy_gen9.c
>> +++ b/lib/rendercopy_gen9.c
>> @@ -23,7 +23,7 @@
>>  #include "intel_reg.h"
>>  #include "igt_aux.h"
>>
>> -#include <intel_aub.h>
>> +#include "tools/intel_aub.h"
>>
>>  #define VERTEX_SIZE (3*4)
>>
>> --
>> 2.9.3
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>-- 
>Daniel Vetter
>Software Engineer, Intel Corporation
>http://blog.ffwll.ch
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox

diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index a7fc2c4..3c4a040 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -22,7 +22,7 @@ 
 #include "intel_reg.h"
 #include "igt_aux.h"
 
-#include <intel_aub.h>
+#include "tools/intel_aub.h"
 
 #define VERTEX_SIZE (3*4)
 
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index 9537480..4fef584 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -23,7 +23,7 @@ 
 #include "intel_reg.h"
 #include "igt_aux.h"
 
-#include <intel_aub.h>
+#include "tools/intel_aub.h"
 
 #define VERTEX_SIZE (3*4)