[2/3] mesa: Enable gallium-llvm on x86 and x86_64

Message ID 20170814032418.3936-2-raj.khem@gmail.com
State New
Headers show
Series
  • [1/3] musl: Update to latest master
Related show

Commit Message

Khem Raj Aug. 14, 2017, 3:24 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta/recipes-graphics/cairo/cairo.inc | 3 ++-
 meta/recipes-graphics/mesa/mesa.inc   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.14.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Richard Purdie Aug. 16, 2017, 8:09 a.m. | #1
On Sun, 2017-08-13 at 20:24 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-
>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++
>  2 files changed, 5 insertions(+), 1 deletion(-)

I think this breaks on x32:

https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/1183/steps/BuildImages/logs/stdio

Cheers,

Richard
Richard Purdie Aug. 16, 2017, 8:11 a.m. | #2
On Wed, 2017-08-16 at 09:09 +0100, Richard Purdie wrote:
> On Sun, 2017-08-13 at 20:24 -0700, Khem Raj wrote:
> > 
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/recipes-graphics/cairo/cairo.inc | 3 ++-
> >  meta/recipes-graphics/mesa/mesa.inc   | 3 +++
> >  2 files changed, 5 insertions(+), 1 deletion(-)
> I think this breaks on x32:
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds
> /1183/steps/BuildImages/logs/stdio

Also on musl:

https://autobuilder.yoctoproject.org/main/builders/nightly-musl/builds/523/steps/BuildImages/logs/stdio

Cheers,

Richard
Khem Raj Aug. 17, 2017, 3:10 a.m. | #3
On 8/16/17 1:11 AM, Richard Purdie wrote:
> On Wed, 2017-08-16 at 09:09 +0100, Richard Purdie wrote:
>> On Sun, 2017-08-13 at 20:24 -0700, Khem Raj wrote:
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> ---
>>>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-
>>>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++
>>>  2 files changed, 5 insertions(+), 1 deletion(-)
>> I think this breaks on x32:
>>
>> https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds
>> /1183/steps/BuildImages/logs/stdio
> 
> Also on musl:
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-musl/builds/523/steps/BuildImages/logs/stdio
> 

Fixed and patch is on ml
http://lists.openembedded.org/pipermail/openembedded-core/2017-August/140928.html

> Cheers,
> 
> Richard
>
Khem Raj Aug. 17, 2017, 3:12 a.m. | #4
On 8/16/17 1:09 AM, Richard Purdie wrote:
> On Sun, 2017-08-13 at 20:24 -0700, Khem Raj wrote:
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-
>>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++
>>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> I think this breaks on x32:
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/1183/steps/BuildImages/logs/stdio
> 

Its not a usual target I build. I will see I can reproduce it.
Otherwise, I will send a v2 where I will disable llvmpipe for x32 in mesa.

> Cheers,
> 
> Richard
>
Khem Raj Aug. 17, 2017, 6:18 a.m. | #5
On Wed, Aug 16, 2017 at 1:09 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sun, 2017-08-13 at 20:24 -0700, Khem Raj wrote:

>> Signed-off-by: Khem Raj <raj.khem@gmail.com>

>> ---

>>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-

>>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++

>>  2 files changed, 5 insertions(+), 1 deletion(-)

>

> I think this breaks on x32:

>

> https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/1183/steps/BuildImages/logs/stdio

>


i cant reproduce this here i changed

-DEFAULTTUNE ?= "core2-64"
+DEFAULTTUNE ?= "core2-64-x32"


and built mesa and core-image-sato from scratch. all seems to build and boot ok

> Cheers,

>

> Richard

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Richard Purdie Aug. 19, 2017, 8:18 a.m. | #6
On Sun, 2017-08-13 at 20:24 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-
>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++
>  2 files changed, 5 insertions(+), 1 deletion(-)

Fails with various multilib tests:

https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/bui
lds/1213/steps/BuildImages_2/logs/stdio


https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/bui
lds/1213/steps/BuildImages_3/logs/stdio

https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/bui
lds/1213/steps/BuildImages_4/logs/stdio

Cheers,

Richard

Patch

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 8e1e2e1b88..f07b42d573 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -22,7 +22,8 @@  X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
-           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"
+           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 45361c7790..a26858df85 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -36,6 +36,9 @@  PACKAGECONFIG ??= "gbm egl gles dri \
 		${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 vulkan', d)} \
 		${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
 		"
+PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"
+PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"
+
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
 
 X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"