Patchwork [12/12] xf86-video-omapfb: upgrade to 0.4.2

login
register
mail settings
Submitter Laurentiu Palcu
Date Nov. 13, 2012, 12:18 p.m.
Message ID <0793c2728cde3530f6d21c865aa017bb00007de5.1352808309.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/38899/
State New
Headers show

Comments

Laurentiu Palcu - Nov. 13, 2012, 12:18 p.m.
Other changes:
 * changed the recipe's SRC_URI to track the new (maintained) repo;
 * removed all old patches as the latest driver's structure has changed
   drastically;
 * license file changed quite a bit: MIT -> GPLv2 (needs to be reviewed
   by somebody with a better understanding of these things though);
 * xf86-video-omapfb changed its name to xf86-video-omap: change the
   recipe name and config files accordingly;
 * add dependency of libdrm-omap;

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
 ...-video-omapfb_git.bb => xf86-video-omap_git.bb} |   23 ++++++++------------
 .../target/arch/arm/conf/machine/{{=machine}}.conf |    2 +-
 3 files changed, 11 insertions(+), 16 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb => xf86-video-omap_git.bb} (43%)
Denis Carikli - Nov. 13, 2012, 2:11 p.m.
On Tue, 13 Nov 2012 14:18:29 +0200
Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:

> Other changes:
>  * changed the recipe's SRC_URI to track the new (maintained) repo;
>  * removed all old patches as the latest driver's structure has
> changed drastically;
>  * license file changed quite a bit: MIT -> GPLv2 (needs to be
> reviewed by somebody with a better understanding of these things
> though);
>  * xf86-video-omapfb changed its name to xf86-video-omap: change the
>    recipe name and config files accordingly;
>  * add dependency of libdrm-omap;
> 
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
>  meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
>  ...-video-omapfb_git.bb => xf86-video-omap_git.bb} |   23
> ++++++++------------ .../target/arch/arm/conf/machine/{{=machine}}.conf
> |    2 +- 3 files changed, 11 insertions(+), 16 deletions(-)
>  rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb
> => xf86-video-omap_git.bb} (43%)
> 
> diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf
> b/meta-yocto-bsp/conf/machine/beagleboard.conf index 6633880..204be95
> 100644 --- a/meta-yocto-bsp/conf/machine/beagleboard.conf
> +++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
> @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
>  XSERVER ?= "xserver-xorg \
>             xf86-input-evdev \
>             xf86-input-mouse \
> -           xf86-video-omapfb \
> +           xf86-video-omap \
>             xf86-input-keyboard"
Since xf86-video-omap is a totally different driver and depend on:
* omap DRM video driver that is in staging only in recent kernels.
* enabling the omap DRM in the board file(providing you don't use
  device tree), which is not straingtforward(there are tricks required).
* omap enabled in libdrm.

Could you instead make a new xf86-video-omap recipe instead of
modifying the xf86-video-omapfb one?

Note that xf86-video-omap should support rotation(xrandr -o 1) for
omap4 (from #xorg-devel ) :
Oct 22 00:52:32 <robclark>      it supports rotation, but only on
omap4..

(I know all that because I tried to make it work on the GTA04 machine,
to have rotation but at the end I discovered that the rotation was
only for omap4(because the rotation is based on tiler), so I
abandoned.).

Denis.
Martin Jansa - Nov. 21, 2012, 9:48 a.m.
On Tue, Nov 13, 2012 at 03:11:34PM +0100, Denis 'GNUtoo' Carikli wrote:
> On Tue, 13 Nov 2012 14:18:29 +0200
> Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> 
> > Other changes:
> >  * changed the recipe's SRC_URI to track the new (maintained) repo;
> >  * removed all old patches as the latest driver's structure has
> > changed drastically;
> >  * license file changed quite a bit: MIT -> GPLv2 (needs to be
> > reviewed by somebody with a better understanding of these things
> > though);
> >  * xf86-video-omapfb changed its name to xf86-video-omap: change the
> >    recipe name and config files accordingly;
> >  * add dependency of libdrm-omap;
> > 
> > Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> > ---
> >  meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
> >  ...-video-omapfb_git.bb => xf86-video-omap_git.bb} |   23
> > ++++++++------------ .../target/arch/arm/conf/machine/{{=machine}}.conf
> > |    2 +- 3 files changed, 11 insertions(+), 16 deletions(-)
> >  rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb
> > => xf86-video-omap_git.bb} (43%)
> > 
> > diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf
> > b/meta-yocto-bsp/conf/machine/beagleboard.conf index 6633880..204be95
> > 100644 --- a/meta-yocto-bsp/conf/machine/beagleboard.conf
> > +++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
> > @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> >  XSERVER ?= "xserver-xorg \
> >             xf86-input-evdev \
> >             xf86-input-mouse \
> > -           xf86-video-omapfb \
> > +           xf86-video-omap \
> >             xf86-input-keyboard"
> Since xf86-video-omap is a totally different driver and depend on:
> * omap DRM video driver that is in staging only in recent kernels.
> * enabling the omap DRM in the board file(providing you don't use
>   device tree), which is not straingtforward(there are tricks required).
> * omap enabled in libdrm.
> 
> Could you instead make a new xf86-video-omap recipe instead of
> modifying the xf86-video-omapfb one?

Btw xf86-video-omapfb does not support xserver-1.13 video API.

Someone needs to port
http://cgit.freedesktop.org/xorg/driver/xf86-video-omap/commit/?id=0615ee8cd73068332879695cbdf662cf5b9b597c
to xf86-video-omapfb or merge missing functionality from omapfb to omap
driver.

I've similar patch to fix xf86-video-glamo in meta-oe, but cannot test
it in runtime until we fix SIGILL in systemd dbus on armv4t
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042298.html

Cheers,

> 
> Note that xf86-video-omap should support rotation(xrandr -o 1) for
> omap4 (from #xorg-devel ) :
> Oct 22 00:52:32 <robclark>      it supports rotation, but only on
> omap4..
> 
> (I know all that because I tried to make it work on the GTA04 machine,
> to have rotation but at the end I discovered that the rotation was
> only for omap4(because the rotation is based on tiler), so I
> abandoned.).
> 
> Denis.
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - Nov. 22, 2012, 7:42 a.m.
On Wed, 2012-11-21 at 10:48 +0100, Martin Jansa wrote:
> On Tue, Nov 13, 2012 at 03:11:34PM +0100, Denis 'GNUtoo' Carikli wrote:
> > On Tue, 13 Nov 2012 14:18:29 +0200
> > Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> > 
> > > Other changes:
> > >  * changed the recipe's SRC_URI to track the new (maintained) repo;
> > >  * removed all old patches as the latest driver's structure has
> > > changed drastically;
> > >  * license file changed quite a bit: MIT -> GPLv2 (needs to be
> > > reviewed by somebody with a better understanding of these things
> > > though);
> > >  * xf86-video-omapfb changed its name to xf86-video-omap: change the
> > >    recipe name and config files accordingly;
> > >  * add dependency of libdrm-omap;
> > > 
> > > Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> > > ---
> > >  meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
> > >  ...-video-omapfb_git.bb => xf86-video-omap_git.bb} |   23
> > > ++++++++------------ .../target/arch/arm/conf/machine/{{=machine}}.conf
> > > |    2 +- 3 files changed, 11 insertions(+), 16 deletions(-)
> > >  rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb
> > > => xf86-video-omap_git.bb} (43%)
> > > 
> > > diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf
> > > b/meta-yocto-bsp/conf/machine/beagleboard.conf index 6633880..204be95
> > > 100644 --- a/meta-yocto-bsp/conf/machine/beagleboard.conf
> > > +++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
> > > @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > >  XSERVER ?= "xserver-xorg \
> > >             xf86-input-evdev \
> > >             xf86-input-mouse \
> > > -           xf86-video-omapfb \
> > > +           xf86-video-omap \
> > >             xf86-input-keyboard"
> > Since xf86-video-omap is a totally different driver and depend on:
> > * omap DRM video driver that is in staging only in recent kernels.
> > * enabling the omap DRM in the board file(providing you don't use
> >   device tree), which is not straingtforward(there are tricks required).
> > * omap enabled in libdrm.
> > 
> > Could you instead make a new xf86-video-omap recipe instead of
> > modifying the xf86-video-omapfb one?
> 
> Btw xf86-video-omapfb does not support xserver-1.13 video API.
> 
> Someone needs to port
> http://cgit.freedesktop.org/xorg/driver/xf86-video-omap/commit/?id=0615ee8cd73068332879695cbdf662cf5b9b597c
> to xf86-video-omapfb or merge missing functionality from omapfb to omap
> driver.
> 
> I've similar patch to fix xf86-video-glamo in meta-oe, but cannot test
> it in runtime until we fix SIGILL in systemd dbus on armv4t
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042298.html

Watching things starting to break on the autobuilder due to this is
extremely depressing/frustrating, not least as once you start to see
bits of red which are "known", you start to ignore that build entry all
the time and start missing other bugs.

We really need to have a zero tolerance of build breakage like this,
particularly when there is nobody stepping up and saying "I will fix
this in X timeframe". 

Based on that I've removed the omapfb driver. If someone steps up and
fixes it, I don't mind it coming back but until then, I don't want the
build failures, or to confuse users with recipes that don't work.

Cheers,

Richard

Patch

diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
index 6633880..204be95 100644
--- a/meta-yocto-bsp/conf/machine/beagleboard.conf
+++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
@@ -6,7 +6,7 @@  PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-omap \
            xf86-input-keyboard"
 
 # Ship all kernel modules by default
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
similarity index 43%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
index f16441e..2a85890 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -6,19 +6,14 @@  DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \
 framebuffer."
 
 LICENSE = "MIT-X & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
-DEPENDS += "virtual/libx11"
-
-SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
-PR = "${INC_PR}.6"
-PV = "0.1.1+gitr${SRCPV}"
-
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
-            file://omap-revert-set-CRTC-limit.patch \
-            file://omap-revert-set-virtual-size.patch \
-            file://omap-force-plain-mode.patch  \
-            file://omap-blacklist-tv-out.patch  \
-            file://0004-Attempt-to-fix-VRFB.patch \
+LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
+DEPENDS += "virtual/libx11 libdrm-omap"
+
+SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
+PR = "${INC_PR}.0"
+PV = "0.4.2+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \
 "
 
 S = "${WORKDIR}/git"
@@ -28,5 +23,5 @@  CFLAGS += " -I${STAGING_INCDIR}/xorg "
 
 # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
 do_compile_prepend_armv7a () {
-        sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
+        sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c
 }
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
index a3e2970..1990ef6 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
@@ -9,7 +9,7 @@  PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-omap \
            xf86-input-keyboard"
 
 # Ship all kernel modules by default