Patchwork [1/1] virtual/libgl: switch back to mesa-xlib for qemuarm/qemumips

login
register
mail settings
Submitter Zhai, Edwin
Date March 28, 2012, 10:10 a.m.
Message ID <af00d9bd88e6322d5080f985a36ac38afdf67ea5.1332929227.git.edwin.zhai@intel.com>
Download mbox | patch
Permalink /patch/24721/
State New
Headers show

Comments

Zhai, Edwin - March 28, 2012, 10:10 a.m.
From: Martin Jansa <martin.jansa@gmail.com>

Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
mesa-dri doesn't work for pure qemu emulator.

[YOCTO #2066] fixed.
---
 meta/conf/distro/include/default-providers.inc |    2 +-
 meta/recipes-graphics/mesa/mesa-xlib.inc       |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
Martin Jansa - March 28, 2012, 10:58 a.m.
On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai@intel.com wrote:
> From: Martin Jansa <martin.jansa@gmail.com>

I don't think I've ever sent something like this.
Actually I've sent patch:
default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
* to match default virtual/xserver

And this just reverts it + adds suspicious COMPATIBLE_MACHINE..

Cheers,

> Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
> mesa-dri doesn't work for pure qemu emulator.
> 
> [YOCTO #2066] fixed.
> ---
>  meta/conf/distro/include/default-providers.inc |    2 +-
>  meta/recipes-graphics/mesa/mesa-xlib.inc       |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> index 54c90d3..3850a2f 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
>  PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
>  PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
>  PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
> +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
>  PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
>  PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
>  PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
> index b720e14..c431eab 100644
> --- a/meta/recipes-graphics/mesa/mesa-xlib.inc
> +++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
> @@ -1 +1,3 @@
>  EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
> +
> +COMPATIBLE_MACHINE = "(qemuarm|qemumips|qemuppc)"
> -- 
> 1.7.5.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - March 28, 2012, 11:34 a.m.
On Wed, 2012-03-28 at 12:58 +0200, Martin Jansa wrote:
> On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai@intel.com wrote:
> > From: Martin Jansa <martin.jansa@gmail.com>
> 
> I don't think I've ever sent something like this.
> Actually I've sent patch:
> default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
> * to match default virtual/xserver
> 
> And this just reverts it + adds suspicious COMPATIBLE_MACHINE..
> 
> Cheers,
> 
> > Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
> > mesa-dri doesn't work for pure qemu emulator.
> > 
> > [YOCTO #2066] fixed.
> > ---
> >  meta/conf/distro/include/default-providers.inc |    2 +-
> >  meta/recipes-graphics/mesa/mesa-xlib.inc       |    2 ++
> >  2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> > index 54c90d3..3850a2f 100644
> > --- a/meta/conf/distro/include/default-providers.inc
> > +++ b/meta/conf/distro/include/default-providers.inc
> > @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
> >  PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> >  PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> >  PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
> > +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> >  PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
> >  PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
> >  PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > index b720e14..c431eab 100644
> > --- a/meta/recipes-graphics/mesa/mesa-xlib.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > @@ -1 +1,3 @@
> >  EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
> > +
> > +COMPATIBLE_MACHINE = "(qemuarm|qemumips|qemuppc)"


I agree this COMPATIBLE_MACHINE is wrong.

I'd suggest we need to change both xserver-org to xserver-xorg-lite and
libgl to meta-xlib and then this might work better and address Martin's
concerns too.

I'd like to understand why dri can't work under qemu too though.

Cheers,

Richard
Zhai, Edwin - March 29, 2012, 12:54 a.m.
On Wed, Mar 28, 2012 at 12:34:43PM +0100, Richard Purdie wrote:
> On Wed, 2012-03-28 at 12:58 +0200, Martin Jansa wrote:
> > On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai@intel.com wrote:
> > > From: Martin Jansa <martin.jansa@gmail.com>
> > 
> > I don't think I've ever sent something like this.
> > Actually I've sent patch:
> > default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
> > * to match default virtual/xserver
> > 
> > And this just reverts it + adds suspicious COMPATIBLE_MACHINE..
> > 
> > Cheers,
> > 
> > > Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
> > > mesa-dri doesn't work for pure qemu emulator.
> > > 
> I agree this COMPATIBLE_MACHINE is wrong.

I just want to mesa-xlib only for qemumips/qemuppc/qemuarm.

> 
> I'd suggest we need to change both xserver-org to xserver-xorg-lite and
> libgl to meta-xlib and then this might work better and address Martin's
> concerns too.

You mean add "xserver-xorg-lite" as preferred virtual/xserver in 
meta/conf/machine/qemumips.conf?

> 
> I'd like to understand why dri can't work under qemu too though.

I think this requires: emulated graphic HW capability in qemumips/qemuarm, and 
an drm driver to match the emulated HW. With them, we can turn on "enable-dri" 
for mesa-dri and fight the build issue.

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Zhai, Edwin - March 29, 2012, 1:31 a.m.
On Wed, Mar 28, 2012 at 12:58:37PM +0200, Martin Jansa wrote:
> On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai@intel.com wrote:
> > From: Martin Jansa <martin.jansa@gmail.com>
> 
> I don't think I've ever sent something like this.
> Actually I've sent patch:
> default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
> * to match default virtual/xserver

Yes, this is just a revert to fix the GL failure. Sorry, I don't notice that git 
keep the original author when you revert:(

Could you pls. explain why mesa-xlib doesn't match xserver-xorg?

Thanks,
Edwin

> 
> And this just reverts it + adds suspicious COMPATIBLE_MACHINE..
> 
> Cheers,
> 
> > Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
> > mesa-dri doesn't work for pure qemu emulator.
> > 
> > [YOCTO #2066] fixed.
> > ---
> >  meta/conf/distro/include/default-providers.inc |    2 +-
> >  meta/recipes-graphics/mesa/mesa-xlib.inc       |    2 ++
> >  2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> > index 54c90d3..3850a2f 100644
> > --- a/meta/conf/distro/include/default-providers.inc
> > +++ b/meta/conf/distro/include/default-providers.inc
> > @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
> >  PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> >  PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> >  PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
> > +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> >  PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
> >  PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
> >  PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > index b720e14..c431eab 100644
> > --- a/meta/recipes-graphics/mesa/mesa-xlib.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > @@ -1 +1,3 @@
> >  EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
> > +
> > +COMPATIBLE_MACHINE = "(qemuarm|qemumips|qemuppc)"
> > -- 
> > 1.7.5.4
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Martin Jansa - March 29, 2012, 3:37 a.m.
On Thu, Mar 29, 2012 at 09:31:28AM +0800, Zhai, Edwin wrote:
> On Wed, Mar 28, 2012 at 12:58:37PM +0200, Martin Jansa wrote:
> > On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai@intel.com wrote:
> > > From: Martin Jansa <martin.jansa@gmail.com>
> > 
> > I don't think I've ever sent something like this.
> > Actually I've sent patch:
> > default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
> > * to match default virtual/xserver
> 
> Yes, this is just a revert to fix the GL failure. Sorry, I don't notice that git 
> keep the original author when you revert:(

FWIW: It doesn't keep the original author here, but maybe you have
different git..

> Could you pls. explain why mesa-xlib doesn't match xserver-xorg?

see:
http://patches.openembedded.org/patch/13631/

> 
> Thanks,
> Edwin
> 
> > 
> > And this just reverts it + adds suspicious COMPATIBLE_MACHINE..
> > 
> > Cheers,
> > 
> > > Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
> > > mesa-dri doesn't work for pure qemu emulator.
> > > 
> > > [YOCTO #2066] fixed.
> > > ---
> > >  meta/conf/distro/include/default-providers.inc |    2 +-
> > >  meta/recipes-graphics/mesa/mesa-xlib.inc       |    2 ++
> > >  2 files changed, 3 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> > > index 54c90d3..3850a2f 100644
> > > --- a/meta/conf/distro/include/default-providers.inc
> > > +++ b/meta/conf/distro/include/default-providers.inc
> > > @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
> > >  PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> > >  PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > >  PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> > > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
> > > +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> > >  PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
> > >  PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
> > >  PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > > diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > > index b720e14..c431eab 100644
> > > --- a/meta/recipes-graphics/mesa/mesa-xlib.inc
> > > +++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > > @@ -1 +1,3 @@
> > >  EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
> > > +
> > > +COMPATIBLE_MACHINE = "(qemuarm|qemumips|qemuppc)"
> > > -- 
> > > 1.7.5.4
> > > 
> > > 
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> 
> 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> -- 
> best rgds,
> edwin
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Zhai, Edwin - March 29, 2012, 7:19 a.m.
On Thu, Mar 29, 2012 at 05:37:35AM +0200, Martin Jansa wrote:
> On Thu, Mar 29, 2012 at 09:31:28AM +0800, Zhai, Edwin wrote:
> > On Wed, Mar 28, 2012 at 12:58:37PM +0200, Martin Jansa wrote:
> > > On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai@intel.com wrote:
> > > > From: Martin Jansa <martin.jansa@gmail.com>
> > > 
> > > I don't think I've ever sent something like this.
> > > Actually I've sent patch:
> > > default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
> > > * to match default virtual/xserver
> > 
> > Yes, this is just a revert to fix the GL failure. Sorry, I don't notice that git 
> > keep the original author when you revert:(
> 
> FWIW: It doesn't keep the original author here, but maybe you have
> different git..
> 
> > Could you pls. explain why mesa-xlib doesn't match xserver-xorg?
> 
> see:
> http://patches.openembedded.org/patch/13631/

I see. But this build failure should occur on qemux86 or other BSP, not 
qemuarm/qemumips/qemuppc, right? qemuarm/mips/ppc use xorg-kdrive instead.

So can we add following to avoid wrong COMPATIBLE_MACHINE:
"PREFERRED_PROVIDER_virtual/libgl ?= mesa-xlib"
in meta/conf/machine/include/qemu.inc and

"PEFERRED_PROVIDER_virtual/libgl ?= mesa-dri"
in meta/conf/machine/qemux86.conf/qemux86-64.conf 

Thanks,
Edwin


> 
> > 
> > Thanks,
> > Edwin
> >
Zhai, Edwin - March 30, 2012, 12:08 a.m.
On Thu, Mar 29, 2012 at 08:54:59AM +0800, Zhai, Edwin wrote:
> On Wed, Mar 28, 2012 at 12:34:43PM +0100, Richard Purdie wrote:
> 
> > 
> > I'd like to understand why dri can't work under qemu too though.
> 
> I think this requires: emulated graphic HW capability in qemumips/qemuarm, and 
> an drm driver to match the emulated HW. With them, we can turn on "enable-dri" 
> for mesa-dri and fight the build issue.

Sorry, I mean Xfbdev.

> 
> > 
> > Cheers,
> > 
> > Richard
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> -- 
> best rgds,
> edwin
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 54c90d3..3850a2f 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -5,7 +5,7 @@  PREFERRED_PROVIDER_virtual/db ?= "db"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
index b720e14..c431eab 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib.inc
+++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
@@ -1 +1,3 @@ 
 EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
+
+COMPATIBLE_MACHINE = "(qemuarm|qemumips|qemuppc)"