Re: [Mesa-dev] [PATCH] freedreno: Fix meson build.

2019-02-07 Thread Kristian Høgsberg 
On Thu, Feb 7, 2019 at 8:03 AM Daniel Stone  wrote:
>
> On Thu, 7 Feb 2019 at 14:59, Eric Engestrom  wrote:
> > On Wednesday, 2019-02-06 18:36:09 +, Vinson Lee wrote:
> > > ../src/gallium/drivers/freedreno/freedreno_resource.c: In function 
> > > ‘fd_resource_create_with_modifiers’:
> > > ../src/gallium/drivers/freedreno/freedreno_resource.c:884:30: error: 
> > > ‘DRM_FORMAT_MOD_QCOM_COMPRESSED’ undeclared (first use in this function)
> > >allow_ubwc = find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, 
> > > count);
> >
> > That's a weird error... I would've expected the `#include `
> > to fail with a "No such file". If you copied the wrong part of the error
> > message, can you update that?
>
> Presumably it just finds an outdated copy of drm_fourcc.h, which
> doesn't have the Qualcomm modifier, from the system include path.

Yes - I recommend not having include/drm-uapi in the include path and
instead include kernel headers as #include "drm-uapi/drm_fourcc.h" to
avoid pulling in system headers.

Kristian

> Cheers,
> Daniel
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] freedreno: Fix meson build.

2019-02-07 Thread Daniel Stone 
On Thu, 7 Feb 2019 at 14:59, Eric Engestrom  wrote:
> On Wednesday, 2019-02-06 18:36:09 +, Vinson Lee wrote:
> > ../src/gallium/drivers/freedreno/freedreno_resource.c: In function 
> > ‘fd_resource_create_with_modifiers’:
> > ../src/gallium/drivers/freedreno/freedreno_resource.c:884:30: error: 
> > ‘DRM_FORMAT_MOD_QCOM_COMPRESSED’ undeclared (first use in this function)
> >allow_ubwc = find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, 
> > count);
>
> That's a weird error... I would've expected the `#include `
> to fail with a "No such file". If you copied the wrong part of the error
> message, can you update that?

Presumably it just finds an outdated copy of drm_fourcc.h, which
doesn't have the Qualcomm modifier, from the system include path.

Cheers,
Daniel
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] freedreno: Fix meson build.

2019-02-07 Thread Eric Engestrom 
On Wednesday, 2019-02-06 18:36:09 +, Vinson Lee wrote:
> ../src/gallium/drivers/freedreno/freedreno_resource.c: In function 
> ‘fd_resource_create_with_modifiers’:
> ../src/gallium/drivers/freedreno/freedreno_resource.c:884:30: error: 
> ‘DRM_FORMAT_MOD_QCOM_COMPRESSED’ undeclared (first use in this function)
>allow_ubwc = find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, 
> count);
>   ^

That's a weird error... I would've expected the `#include `
to fail with a "No such file". If you copied the wrong part of the error
message, can you update that?

Regardless, the patch is correct:
Reviewed-by: Eric Engestrom 

> 
> Fixes: 1ce5d757d04a ("freedreno: core buffer modifier support")
> Signed-off-by: Vinson Lee 
> ---
>  src/gallium/drivers/freedreno/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/gallium/drivers/freedreno/meson.build 
> b/src/gallium/drivers/freedreno/meson.build
> index 1e3a3037014b..25aa8ecdb455 100644
> --- a/src/gallium/drivers/freedreno/meson.build
> +++ b/src/gallium/drivers/freedreno/meson.build
> @@ -209,7 +209,7 @@ files_libfreedreno = files(
>  )
>  
>  freedreno_includes = [
> -  inc_src, inc_include, inc_gallium, inc_gallium_aux,
> +  inc_src, inc_include, inc_drm_uapi, inc_gallium, inc_gallium_aux,
>inc_freedreno, include_directories('ir3'),
>  ]
>  
> -- 
> 2.19.1.dropbox.2
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] freedreno: Fix meson build.

2019-02-07 Thread Rob Clark 
On Wed, Feb 6, 2019 at 1:36 PM Vinson Lee  wrote:
>
> ../src/gallium/drivers/freedreno/freedreno_resource.c: In function 
> ‘fd_resource_create_with_modifiers’:
> ../src/gallium/drivers/freedreno/freedreno_resource.c:884:30: error: 
> ‘DRM_FORMAT_MOD_QCOM_COMPRESSED’ undeclared (first use in this function)
>allow_ubwc = find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, 
> count);
>   ^
>
> Fixes: 1ce5d757d04a ("freedreno: core buffer modifier support")
> Signed-off-by: Vinson Lee 

hmm, no idea how I didn't hit that, but this looks like the right thing to do

Reviewed-by: Rob Clark 

> ---
>  src/gallium/drivers/freedreno/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/freedreno/meson.build 
> b/src/gallium/drivers/freedreno/meson.build
> index 1e3a3037014b..25aa8ecdb455 100644
> --- a/src/gallium/drivers/freedreno/meson.build
> +++ b/src/gallium/drivers/freedreno/meson.build
> @@ -209,7 +209,7 @@ files_libfreedreno = files(
>  )
>
>  freedreno_includes = [
> -  inc_src, inc_include, inc_gallium, inc_gallium_aux,
> +  inc_src, inc_include, inc_drm_uapi, inc_gallium, inc_gallium_aux,
>inc_freedreno, include_directories('ir3'),
>  ]
>
> --
> 2.19.1.dropbox.2
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] freedreno: Fix meson build.

2019-02-06 Thread Vinson Lee 
../src/gallium/drivers/freedreno/freedreno_resource.c: In function 
‘fd_resource_create_with_modifiers’:
../src/gallium/drivers/freedreno/freedreno_resource.c:884:30: error: 
‘DRM_FORMAT_MOD_QCOM_COMPRESSED’ undeclared (first use in this function)
   allow_ubwc = find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, count);
  ^

Fixes: 1ce5d757d04a ("freedreno: core buffer modifier support")
Signed-off-by: Vinson Lee 
---
 src/gallium/drivers/freedreno/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/meson.build 
b/src/gallium/drivers/freedreno/meson.build
index 1e3a3037014b..25aa8ecdb455 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -209,7 +209,7 @@ files_libfreedreno = files(
 )
 
 freedreno_includes = [
-  inc_src, inc_include, inc_gallium, inc_gallium_aux,
+  inc_src, inc_include, inc_drm_uapi, inc_gallium, inc_gallium_aux,
   inc_freedreno, include_directories('ir3'),
 ]
 
-- 
2.19.1.dropbox.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] freedreno: Fix meson build.

2019-01-25 Thread Vinson Lee 
../src/gallium/drivers/freedreno/freedreno_resource.c: In function 
‘fd_resource_create_with_modifiers’:
../src/gallium/drivers/freedreno/freedreno_resource.c:884:30: error: 
‘DRM_FORMAT_MOD_QCOM_COMPRESSED’ undeclared (first use in this function)
   allow_ubwc = find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, count);
  ^

Fixes: 1ce5d757d04a ("freedreno: core buffer modifier support")
Signed-off-by: Vinson Lee 
---
 src/gallium/drivers/freedreno/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/meson.build 
b/src/gallium/drivers/freedreno/meson.build
index 1e3a3037014b..25aa8ecdb455 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -209,7 +209,7 @@ files_libfreedreno = files(
 )
 
 freedreno_includes = [
-  inc_src, inc_include, inc_gallium, inc_gallium_aux,
+  inc_src, inc_include, inc_drm_uapi, inc_gallium, inc_gallium_aux,
   inc_freedreno, include_directories('ir3'),
 ]
 
-- 
2.19.1.dropbox.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev