Patchwork [meta-fsl-arm,2/3] gpu-viv-bin-mx6q.inc: If Wayland and X11 are enabled, default to X11

login
register
mail settings
Submitter Otavio Salvador
Date Sept. 1, 2013, 12:35 p.m.
Message ID <1378038938-13700-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/57185/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Sept. 1, 2013, 12:35 p.m.
Vivante GPU driver does not support use of Wayland AND X11 backends at
same time, so we need to choose one for default. We previously had
choose Wayland but many users are reporting problems as the usual
expected support is still X11 so we're moving the default for X11 now.

Change-Id: I30f092509f060d3bced358324a296b0f798da2cb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
Daiane Angolini - Sept. 2, 2013, 12:23 p.m.
On 09/01/2013 09:35 AM, Otavio Salvador wrote:
> Vivante GPU driver does not support use of Wayland AND X11 backends at
> same time, so we need to choose one for default. We previously had
> choose Wayland but many users are reporting problems as the usual
> expected support is still X11 so we're moving the default for X11 now.
>
> Change-Id: I30f092509f060d3bced358324a296b0f798da2cb
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

I agree, thanks for the patch.


>   recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> index 0a53900..9407db8 100644
> --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> @@ -106,8 +106,15 @@ do_install () {
>
>       install -d ${D}${libdir}/pkgconfig
>
> -    # If both X11 and Wayland are set in DISTRO_FEATURES then use Wayland as base window system
> -    if [ "${USE_WL}" = "yes" ]; then
> +    # The preferrence order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb

the "preference" order.

> +    if [ "${USE_X11}" = "yes" ]; then
> +        cp -r ${S}/usr/lib/dri ${D}${libdir}
> +        backend=x11
> +
> +        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
> +        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
> +        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
> +    elif [ "${USE_WL}" = "yes" ]; then
>           backend=wl
>
>           install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
> @@ -121,13 +128,6 @@ do_install () {
>           if [ "${USE_X11}" = "yes" ]; then
>               cp -r ${S}/usr/lib/dri ${D}${libdir}
>           fi
> -    elif [ "${USE_X11}" = "yes" ]; then
> -        cp -r ${S}/usr/lib/dri ${D}${libdir}
> -        backend=x11
> -
> -        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
> -        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
> -        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
>       else
>           install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
>           install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
>

Patch

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 0a53900..9407db8 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -106,8 +106,15 @@  do_install () {
 
     install -d ${D}${libdir}/pkgconfig
 
-    # If both X11 and Wayland are set in DISTRO_FEATURES then use Wayland as base window system
-    if [ "${USE_WL}" = "yes" ]; then
+    # The preferrence order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
+    if [ "${USE_X11}" = "yes" ]; then
+        cp -r ${S}/usr/lib/dri ${D}${libdir}
+        backend=x11
+
+        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
+    elif [ "${USE_WL}" = "yes" ]; then
         backend=wl
 
         install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
@@ -121,13 +128,6 @@  do_install () {
         if [ "${USE_X11}" = "yes" ]; then
             cp -r ${S}/usr/lib/dri ${D}${libdir}
         fi
-    elif [ "${USE_X11}" = "yes" ]; then
-        cp -r ${S}/usr/lib/dri ${D}${libdir}
-        backend=x11
-
-        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
     else
         install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
         install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc