[meta-fsl-arm][PATCH v5 1/6] gpu-viv-bin-mx6q: Include sololite changes to remove 3D libraries.

[meta-fsl-arm][PATCH v5 1/6] gpu-viv-bin-mx6q: Include sololite changes to remove 3D libraries.

[Neena Busireddy]

Sololite does not support 3D GPU hardware acceleration.Hence, remove
all the 3D libraries from graphics package for this machine.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |   25 +++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

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 912063d..153e883 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
@@ -11,7 +11,9 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamag
                              base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \
                                            '', d), d)}"
 
-PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg"
+PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg"
+PROVIDES_append_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+PROVIDES_append_mx6dl  = " virtual/libgl virtual/libgles1 virtual/libgles2"
 
 PE = "1"
 
@@ -104,6 +106,9 @@ python __anonymous() {
         d.appendVar("RCONFLICTS_" + fullp, pkgs)
 }
 
+IS_MX6SL = "0"
+IS_MX6SL_mx6sl = "1"
+
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
@@ -184,6 +189,23 @@ do_install () {
     for backend in wl x11 fb dfb; do
         find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';'
     done
+# FIXME: MX6SL does not have 3D support; hack it for now
+    if [ "${IS_MX6SL}" = "1" ]; then
+        rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \
+               \
+               ${D}${libdir}/libGL* ${D}${includedir}/GL* \ 
+               \
+               ${D}${libdir}/libGLES* \
+               \
+               ${D}${libdir}/libOpenCL* \
+               \
+               ${D}${libdir}/libOpenVG.so ${D}${libdir}/libOpenVG_3D.so \
+               \
+               ${D}/opt/viv_samples/vdk \
+               ${D}/opt/viv_samples/es20 ${D}/opt/viv_samples/cl11
+
+        ln -sf ${D}${libdir}/libOpenVG_355.so ${D}${libdir}/libOpenVG.so
+    fi
 
     find ${D}${libdir} -type f -exec chmod 644 {} \;
     find ${D}${includedir} -type f -exec chmod 644 {} \;
@@ -233,6 +255,7 @@ FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
 FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}"
 RDEPENDS_libopencl-mx6 = "libclc-mx6"
 
+INSANE_SKIP_libopenvg-mx6 += "dev-so"
 FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}"
 FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
 FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v5 2/6] cairo: Update recipe to support Sololite.

[Neena Busireddy]

In order to support cairo for sololite, we need to
remove glesv2 from packageconfig since sololite is
not 3D GPU hardware accelerated.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
---
 recipes-graphics/cairo/cairo_%.bbappend |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index bd960e0..2e0152c 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -7,5 +7,7 @@ CFLAGS_append_mx6 = " -DLINUX \
 
 
 PACKAGECONFIG_class-target_mx6 = " \
-    egl glesv2 \
     ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+
+PACKAGECONFIG_class-target_append_mx6q = " egl glesv2"
+PACKAGECONFIG_class-target_append_mx6dl = " egl glesv2"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v5 3/6] mesa: Update mesa and mesa-demos to support Sololite.

[Neena Busireddy]

SoloLite should use mesa software rendering GL since
GPU for this machine does not have hardware accelerated GL.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
---
 recipes-graphics/mesa/mesa-demos_%.bbappend |    1 +
 recipes-graphics/mesa/mesa_%.bbappend       |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 989577d..221a3c0 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -2,3 +2,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch"
 
+PACKAGECONFIG_remove_mx6sl = "gles1 gles2"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 8e0a36b..adcf201 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -2,9 +2,19 @@ PACKAGECONFIG_remove_mx5 = "egl gles"
 PROVIDES_remove_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl"
 
 PACKAGECONFIG_remove_mx6 = "egl gles"
-PROVIDES_remove_mx6 = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
+
+# i.MX6SL uses mesa software rendering
+
+PROVIDES_remove_mx6 = "virtual/libgles1 virtual/libgles2 virtual/egl"
+PROVIDES_remove_mx6q = "virtual/libgl"
+PROVIDES_remove_mx6dl = "virtual/libgl"
+
+USE_VIV_LIBGL = "yes"
+USE_VIV_LIBGL_mx6sl = "no"
 
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
 do_install_append_mx6 () {
-    rm -f ${D}${libdir}/libGL.*
+    if [ "${USE_VIV_LIBGL}" = "yes" ]; then
+        rm -f ${D}${libdir}/libGL.*
+    fi
 }
-- 
1.7.9.5

[meta-fsl-arm][PATCH v5 4/6] glmark2: Create bbappend to include Sololite changes.

[Neena Busireddy]

Remove gles2 from packageconfig for sololite as it does
not support 3D GPU hardware acceleration.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
---
 recipes-benchmark/glmark2/glmark2_%.bbappend |    3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 recipes-benchmark/glmark2/glmark2_%.bbappend

diff --git a/recipes-benchmark/glmark2/glmark2_%.bbappend b/recipes-benchmark/glmark2/glmark2_%.bbappend
new file mode 100644
index 0000000..8e57d66
--- /dev/null
+++ b/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -0,0 +1,3 @@
+#Remove gles2 as it is not supported by sololite
+
+PACKAGECONFIG_remove_mx6sl = "gles2"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v5 5/6] weston: Add sololite changes

[Neena Busireddy]

Sololite does not support 3D GPU hardware acceleration, so
remove gles flags from compilation.

Also, included the patches to enable GAL2D compositor and change
GAL2D compositor to be default when EGL is not enabled in Sololite.

Patch for crashes on touch device without a pointer is applicable
for all iMX6 machines.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
---
 ...3-Distorted-line-and-shadow-if-use-2d-com.patch |  256 ++++++++++++++++++++
 ...top-shell-Don-t-assume-there-is-a-pointer.patch |   36 +++
 .../0005-Enable-GAL2D-compositor-in-SoloLite.patch |   36 +++
 ...6-Change-GAL2D-compositor-to-be-default-i.patch |   35 +++
 recipes-graphics/wayland/weston_%.bbappend         |   30 ++-
 5 files changed, 385 insertions(+), 8 deletions(-)
 create mode 100644 recipes-graphics/wayland/weston/0003-Distorted-line-and-shadow-if-use-2d-com.patch
 create mode 100644 recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch
 create mode 100644 recipes-graphics/wayland/weston/0005-Enable-GAL2D-compositor-in-SoloLite.patch
 create mode 100644 recipes-graphics/wayland/weston/0006-Change-GAL2D-compositor-to-be-default-i.patch

diff --git a/recipes-graphics/wayland/weston/0003-Distorted-line-and-shadow-if-use-2d-com.patch b/recipes-graphics/wayland/weston/0003-Distorted-line-and-shadow-if-use-2d-com.patch
new file mode 100644
index 0000000..0e7ffd0
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0003-Distorted-line-and-shadow-if-use-2d-com.patch
@@ -0,0 +1,256 @@
+From 1fd17db2ab978322803683a4d2d847a0b31a4c1c Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
+Date: Tue, 24 Jun 2014 15:44:13 -0500
+Subject: [PATCH 3/3] ENGR00319247 : Distorted line and shadow if use 2d
+ compositor to run wayland apps.
+
+Fixed blending for shadown and maintained separate surface for damage composite.
+
+Upstream Status: N/A
+
+Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
+---
+ src/compositor-fbdev.c |   8 ++--
+ src/gal2d-renderer.c   | 102 +++++++++++++++++++++++++++++++++++--------------
+ src/gal2d-renderer.h   |   6 +++
+ 3 files changed, 83 insertions(+), 33 deletions(-)
+
+diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
+index a3d32e5..b27d199 100644
+--- a/src/compositor-fbdev.c
++++ b/src/compositor-fbdev.c
+@@ -55,7 +55,7 @@ struct fbdev_compositor {
+ 	int use_pixman;
+ 	int use_gal2d;
+ 	struct wl_listener session_listener;
+-	EGLNativeDisplayType display;
++	NativeDisplayType display;
+ };
+ 
+ struct fbdev_screeninfo {
+@@ -91,8 +91,8 @@ struct fbdev_output {
+ 	void *shadow_buf;
+ 	uint8_t depth;
+ 
+-	EGLNativeDisplayType display;
+-	EGLNativeWindowType  window;
++	NativeDisplayType display;
++	NativeWindowType  window;
+ };
+ 
+ struct fbdev_parameters {
+@@ -667,7 +667,7 @@ fbdev_output_create(struct fbdev_compositor *compositor,
+ 			return 0;
+ 		}
+ 		if (gl_renderer->output_create(&output->base,
+-						(EGLNativeWindowType)output->window,
++						(NativeWindowType)output->window,
+ 						gl_renderer->opaque_attribs,
+ 						NULL) < 0) {
+ 			weston_log("gl_renderer_output_create failed.\n");
+diff --git a/src/gal2d-renderer.c b/src/gal2d-renderer.c
+index c651573..fbe39f6 100644
+--- a/src/gal2d-renderer.c
++++ b/src/gal2d-renderer.c
+@@ -42,7 +42,7 @@ struct gal2d_output_state {
+ 	
+ 	int current_buffer;
+ 	pixman_region32_t buffer_damage[2];
+-	EGLNativeDisplayType display;
++	NativeDisplayType display;
+     gcoSURF* renderSurf;
+ 	gctUINT32 nNumBuffers;
+ 	int activebuffer;
+@@ -423,11 +423,9 @@ gal2dBindBuffer(struct weston_surface* es)
+ 	gcoSURF surface = gs->gco_Surface;	
+     struct weston_buffer *buffer = gs->buffer_ref.buffer;
+ 	gcePOOL pool = gcvPOOL_DEFAULT;
+-	gctUINT64 node = 0;
+-	gctUINT bytes;
+-
+-	gcmVERIFY_OK(gcoSURF_QueryVidMemNode(surface, &node,
+-						&pool, &bytes));
++    
++	gcmVERIFY_OK(gcoSURF_QueryVidMemNode(surface, gcvNULL,
++						&pool, gcvNULL));
+ 
+ 	if(pool != gcvPOOL_USER)
+ 	{
+@@ -801,24 +799,26 @@ draw_view(struct weston_view *ev, struct weston_output *output,
+ 				  ev->surface->width, ev->surface->height);
+ 	pixman_region32_subtract(&surface_blend, &surface_blend, &ev->surface->opaque);
+ 
++    struct gal2d_renderer *gr = get_renderer(ec);
++    
+ 	if (pixman_region32_not_empty(&ev->surface->opaque)) {
+ 
+ 		repaint_region(ev, output, go, &repaint, &ev->surface->opaque);
+ 	}
+ 
+ 	if (pixman_region32_not_empty(&surface_blend)) {
+-        struct gal2d_renderer *gr = get_renderer(ec);
+-        
++    
+         gco2D_EnableAlphaBlend(gr->gcoEngine2d,
+-			ev->alpha * 0xFF, ev->alpha * 0xFF,
+-			gcvSURF_PIXEL_ALPHA_STRAIGHT, gcvSURF_PIXEL_ALPHA_STRAIGHT,
+-			gcvSURF_GLOBAL_ALPHA_OFF, gcvSURF_GLOBAL_ALPHA_OFF,
+-			gcvSURF_BLEND_ONE, gcvSURF_BLEND_INVERSED,
+-			gcvSURF_COLOR_STRAIGHT, gcvSURF_COLOR_STRAIGHT);
++            ev->alpha * 0xFF, ev->alpha * 0xFF,
++            gcvSURF_PIXEL_ALPHA_STRAIGHT, gcvSURF_PIXEL_ALPHA_STRAIGHT,
++            gcvSURF_GLOBAL_ALPHA_SCALE, gcvSURF_GLOBAL_ALPHA_SCALE,
++            gcvSURF_BLEND_STRAIGHT, gcvSURF_BLEND_INVERSED,
++            gcvSURF_COLOR_STRAIGHT, gcvSURF_COLOR_STRAIGHT);
+             
+ 		repaint_region(ev, output, go, &repaint, &surface_blend);
+ 	}
+ 
++    gco2D_DisableAlphaBlend(gr->gcoEngine2d);
+ 	pixman_region32_fini(&surface_blend);
+ 
+ out:
+@@ -866,6 +866,48 @@ gal2d_renderer_repaint_output(struct weston_output *output,
+ }
+ 
+ static void
++gal2d_renderer_attach_egl(struct weston_surface *es, struct weston_buffer *buffer)
++{
++    gcsWL_VIV_BUFFER *vivBuffer = wl_resource_get_user_data(buffer->resource);
++    gctUINT width = 0;
++    gctUINT height = 0;
++    gctINT stride = 0;
++    gceSURF_FORMAT format;
++    gcoSURF srcSurf = vivBuffer->surface;
++    gctUINT32 physical;
++    gctPOINTER va =0;
++    gceSTATUS status = gcvSTATUS_OK;
++    struct gal2d_surface_state *gs = get_surface_state(es);
++        
++    if(gs->gco_Surface == gcvNULL)
++    {
++        /** Construct a wrapper. */
++        gcmONERROR(gcoSURF_ConstructWrapper(gcvNULL, &gs->gco_Surface));
++    }
++
++    gcmONERROR(gcoSURF_GetAlignedSize(srcSurf, &width, &height, &stride));
++    gcmONERROR(gcoSURF_GetFormat(srcSurf, gcvNULL, &format));
++    gcmONERROR(gcoSURF_Lock(srcSurf, &physical, (gctPOINTER *)&va));  
++
++    /* Set the buffer. */
++    gcmONERROR(gcoSURF_SetBuffer(gs->gco_Surface,
++                               gcvSURF_BITMAP_NO_VIDMEM,
++                               format,
++                               stride,
++                               (gctPOINTER) va,
++                               (gctUINT32) physical));
++
++    /* Set the window. */
++    gcmONERROR(gcoSURF_SetWindow(gs->gco_Surface, 0, 0, width, height));
++    
++    buffer->width = vivBuffer->width;
++    buffer->height = vivBuffer->height;
++    
++  OnError:
++    galONERROR(status);
++}
++
++static void
+ gal2d_renderer_flush_damage(struct weston_surface *surface)
+ {
+ 	struct gal2d_surface_state *gs = get_surface_state(surface);
+@@ -900,10 +942,7 @@ gal2d_renderer_flush_damage(struct weston_surface *surface)
+ 		gal2dBindBuffer(surface);
+ 	}
+ 	else
+-	{
+-		gcsWL_VIV_BUFFER *vivBuffer = (gcsWL_VIV_BUFFER *)buffer;
+-		gs->gco_Surface = vivBuffer->surface;
+-	}
++        gal2d_renderer_attach_egl(surface, buffer);
+ 
+ done:
+ 	pixman_region32_fini(&gs->texture_damage);
+@@ -937,19 +976,17 @@ gal2d_renderer_attach(struct weston_surface *es, struct weston_buffer *buffer)
+ 		}
+ 	}
+ 	else
+-	{
+-		gcsWL_VIV_BUFFER *vivBuffer = wl_resource_get_user_data(buffer->resource);
+-		gs->gco_Surface = vivBuffer->surface;
+-
+-		buffer->width = vivBuffer->width;
+-		buffer->height = vivBuffer->height;
+-	}
++		gal2d_renderer_attach_egl(es, buffer);
+ }
+ 
+ static void
+ surface_state_destroy(struct gal2d_surface_state *gs, struct gal2d_renderer *gr)
+ {
+-	wl_list_remove(&gs->surface_destroy_listener.link);
++	if(gs->gco_Surface)
++    {
++        gcoSURF_Destroy(gs->gco_Surface);
++    }
++    wl_list_remove(&gs->surface_destroy_listener.link);
+ 	wl_list_remove(&gs->renderer_destroy_listener.link);
+ 	if(gs->surface)
+ 		gs->surface->renderer_state = NULL;
+@@ -1043,8 +1080,12 @@ gal2d_renderer_output_destroy(struct weston_output *output)
+ {
+     struct gal2d_output_state *go = get_output_state(output);
+     gctUINT32 i;
+-    
+-	if(go->nNumBuffers <= 1 )
++
++    for (i = 0; i < 2; i++)
++    {
++        pixman_region32_fini(&go->buffer_damage[i]);
++    }
++    if(go->nNumBuffers <= 1 )
+ 	{
+ 		if(go->offscreenSurface)
+ 			gcmVERIFY_OK(gcoSURF_Destroy(go->offscreenSurface));
+@@ -1107,8 +1148,8 @@ OnError:
+ }
+ 
+ static int
+-gal2d_renderer_output_create(struct weston_output *output, EGLNativeDisplayType display,
+-				    EGLNativeWindowType window)
++gal2d_renderer_output_create(struct weston_output *output, NativeDisplayType display,
++				    NativeWindowType window)
+ 
+  {
+     struct gal2d_renderer *gr = get_renderer(output->compositor);
+@@ -1174,6 +1215,9 @@ gal2d_renderer_output_create(struct weston_output *output, EGLNativeDisplayType
+ 		gal2d_clear(output);
+ 		gal2d_flip_surface(output);
+ 	}
++
++	for (i = 0; i < 2; i++)
++		pixman_region32_init(&go->buffer_damage[i]);
+ OnError:
+     galONERROR(status);
+     /* Return the status. */
+diff --git a/src/gal2d-renderer.h b/src/gal2d-renderer.h
+index 3b89f73..1322a7d 100644
+--- a/src/gal2d-renderer.h
++++ b/src/gal2d-renderer.h
+@@ -24,7 +24,13 @@
+ #define __gal_2d_renderer_h_
+ 
+ #include  "compositor.h"
++#ifdef ENABLE_EGL
+ #include <EGL/egl.h>
++#else
++#include <HAL/gc_hal_eglplatform.h>
++typedef HALNativeDisplayType NativeDisplayType;
++typedef HALNativeWindowType  NativeWindowType;
++#endif
+ 
+ 
+ struct gal2d_renderer_interface {
+-- 
+2.0.0
+
diff --git a/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch b/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch
new file mode 100644
index 0000000..f6ef253
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch
@@ -0,0 +1,36 @@
+From 1194ccebc0db14ba681bd8272e01715b3e7008cc Mon Sep 17 00:00:00 2001
+From: Yong Gan <b45748@freescale.com>
+Date: Fri, 27 Jun 2014 11:33:53 +0800
+Subject: [PATCH] ENGR00320189 desktop-shell: Don't assume there is a pointer
+ when resizing
+
+Fixes a crash on touch devices without a pointer, when touching
+the window frame of a client.
+cherry-pick from 5872b6821be7c9c0a17a0de962e3f4a04f5d0c6f
+
+Date: Jun 27, 2014
+
+Upstream Status: N/A
+
+Signed-off-by Yong Gan <B45748@freescale.com>
+---
+ desktop-shell/shell.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
+index 84f5c83..d965618 100644
+--- a/desktop-shell/shell.c
++++ b/desktop-shell/shell.c
+@@ -1784,7 +1784,8 @@ common_surface_resize(struct wl_resource *resource,
+ 	struct shell_surface *shsurf = wl_resource_get_user_data(resource);
+ 	struct weston_surface *surface;
+ 
+-	if (seat->pointer->button_count == 0 ||
++	if (seat->pointer == NULL ||
++	    seat->pointer->button_count == 0 ||
+ 	    seat->pointer->grab_serial != serial ||
+ 	    seat->pointer->focus == NULL)
+ 		return;
+-- 
+1.7.9.5
+
diff --git a/recipes-graphics/wayland/weston/0005-Enable-GAL2D-compositor-in-SoloLite.patch b/recipes-graphics/wayland/weston/0005-Enable-GAL2D-compositor-in-SoloLite.patch
new file mode 100644
index 0000000..cf08900
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0005-Enable-GAL2D-compositor-in-SoloLite.patch
@@ -0,0 +1,36 @@
+From 1eea925312fb7e1bc1cf42e001069cbac887b128 Mon Sep 17 00:00:00 2001
+From: Yong Gan <b45748@freescale.com>
+Date: Wed, 2 Jul 2014 11:27:26 +0800
+Subject: [PATCH] ENGR00320243 Enable GAL2D compositor in SoloLite
+
+Build gal2d-renderer.so when EGL was not enabled.
+
+Date: Jul 02, 2014
+Signed-off-by Yong Gan <yong.gan@freescale.com>
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2bccfe9..42148b1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -162,6 +162,7 @@ gl_renderer_la_SOURCES =			\
+ 	src/gl-renderer.c			\
+ 	src/vertex-clipping.c			\
+ 	src/vertex-clipping.h
++endif
+ 
+ module_LTLIBRARIES += gal2d-renderer.la
+ gal2d_renderer_la_LDFLAGS = -module -avoid-version
+@@ -175,7 +176,6 @@ gal2d_renderer_la_SOURCES =			\
+ 	src/gal2d-renderer.c			\
+ 	src/vertex-clipping.c			\
+ 	src/vertex-clipping.h
+-endif
+ 
+ if ENABLE_X11_COMPOSITOR
+ module_LTLIBRARIES += x11-backend.la
+-- 
+1.7.9.5
+
diff --git a/recipes-graphics/wayland/weston/0006-Change-GAL2D-compositor-to-be-default-i.patch b/recipes-graphics/wayland/weston/0006-Change-GAL2D-compositor-to-be-default-i.patch
new file mode 100644
index 0000000..e0a855f
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0006-Change-GAL2D-compositor-to-be-default-i.patch
@@ -0,0 +1,35 @@
+From 916e1fe5ca320f3115e904ae5543da3c5603d70e Mon Sep 17 00:00:00 2001
+From: Yong Gan <b45748@freescale.com>
+Date: Fri, 4 Jul 2014 09:57:11 +0800
+Subject: [PATCH] ENGR00321030 Change GAL2D compositor to be default in
+ SoloLite.
+
+Change GAL2D compositor to be default When EGL is not enabled.
+
+Date: Jul 03, 2014
+Signed-off-by Yong Gan <yong.gan@freescale.com>
+---
+ src/compositor-fbdev.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
+index b27d199..bdc6ec9 100644
+--- a/src/compositor-fbdev.c
++++ b/src/compositor-fbdev.c
+@@ -1060,8 +1060,13 @@ backend_init(struct wl_display *display, int *argc, char *argv[],
+ 	struct fbdev_parameters param = {
+ 		.tty = 0, /* default to current tty */
+ 		.device = "/dev/fb0", /* default frame buffer */
++#ifdef ENABLE_EGL
+ 		.use_gl = 1,
+ 		.use_gal2d = 0,
++#else
++		.use_gl = 0,
++		.use_gal2d = 1,
++#endif
+ 	};
+ 
+ 	const struct weston_option fbdev_options[] = {
+-- 
+1.7.9.5
+
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index 06aaed8..d6d1945 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -1,23 +1,37 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_mx6 = " \
-    file://0001-ENGR00314805-1-Add-Vivante-EGL-support.patch \
-    file://0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch"
-
-PACKAGECONFIG_mx6 = "fbdev egl cairo-glesv2"
+SRC_URI_append_mx6 = " file://0001-ENGR00314805-1-Add-Vivante-EGL-support.patch \
+             file://0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch \
+             file://0003-Distorted-line-and-shadow-if-use-2d-com.patch \
+             file://0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch \
+             file://0005-Enable-GAL2D-compositor-in-SoloLite.patch \
+             file://0006-Change-GAL2D-compositor-to-be-default-i.patch \
+             "
+PACKAGECONFIG_mx6 = "fbdev"
+PACKAGECONFIG_append_mx6q = " egl cairo-glesv2"
+PACKAGECONFIG_append_mx6dl = " egl cairo-glesv2"
 
 EXTRA_OECONF_append_mx6 = " \
     --disable-libunwind \
     --disable-xwayland-test \
     WESTON_NATIVE_BACKEND=fbdev-backend.so \
 "
-
 EXTRA_OEMAKE_append_mx6 = " \
-    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
     COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
     FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
-    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
     SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
     EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
     CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \
 "
+EXTRA_OEMAKE_append_mx6q = " \
+    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
+    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
+"
+EXTRA_OEMAKE_append_mx6dl = " \
+    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
+    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
+"
+EXTRA_OEMAKE_append_mx6sl = " \
+    COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
+    FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \
+"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v5 6/6] imx-base: Add MACHINE_ARCH filter for sololite.

[Neena Busireddy]

Add MACHINE_ARCH_FILTER for sololite as it is different from other
SOC families (Sololite does not support 3D GPU hardware acceleration).

Sololite uses mesa software rendering GL. So, set the PREFERRED
PROVIDER to use mesa for SL.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
---
 conf/machine/include/imx-base.inc |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 9f0217e..5d4a518 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -47,9 +47,11 @@ MACHINE_SOCARCH_vf60 = "${TUNE_PKGARCH}-vf60"
 PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
+MACHINE_ARCH_FILTER_append_mx6sl = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
 MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins"
 MACHINE_SOCARCH_FILTER_append_mx5 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
-MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
+MACHINE_SOCARCH_FILTER_append_mx6q = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
+MACHINE_SOCARCH_FILTER_append_mx6dl = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
 
 INHERIT += "fsl-dynamic-packagearch"
 
@@ -92,9 +94,15 @@ PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 
 # mx6 GPU libraries
 PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgl_mx6 ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles1_mx6dl = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles1_mx6sl = "mesa"
+PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles2_mx6dl = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles2_mx6sl = "mesa"
+PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgl_mx6dl = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgl_mx6sl = "mesa"
 
 PREFERRED_PROVIDER_virtual/kernel_mx3 ?= "linux-fslc"
 
-- 
1.7.9.5

Re: [meta-fsl-arm][PATCH v5 5/6] weston: Add sololite changes

[Otavio Salvador]

On Mon, Aug 18, 2014 at 5:10 PM, Neena Busireddy
<neena.busireddy@freescale.com> wrote:
> Sololite does not support 3D GPU hardware acceleration, so
> remove gles flags from compilation.
>
> Also, included the patches to enable GAL2D compositor and change
> GAL2D compositor to be default when EGL is not enabled in Sololite.
>
> Patch for crashes on touch device without a pointer is applicable
> for all iMX6 machines.
>
> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>

Found following failure in our autobuilder:

wayland fsl-image-machine-test@imx6qsabresd (1/3) | configure: error:
cairo-egl not used because No package 'cairo-egl' found
wayland fsl-image-machine-test@imx6qsabresd (1/3) | No package
'cairo-glesv2' found
wayland fsl-image-machine-test@imx6qsabresd (1/3) | Configure failed.
The contents of all config.log files follows to aid debugging
wayland fsl-image-machine-test@imx6qsabresd (1/3) | ERROR: oe_runconf failed
wayland fsl-image-machine-test@imx6qsabresd (1/3) | WARNING: exit code
1 from a shell command.
wayland fsl-image-machine-test@imx6qsabresd (1/3) | ERROR: Function
failed: do_configure (log file is located at
.../build-wayland/tmp/work/cortexa9hf-vfp-neon-mx6-poky-linux-gnueabi/weston/1.5.0-r0/temp/log.do_configure.30855)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm][PATCH v5 5/6] weston: Add sololite changes

[Neena Busireddy]

Hi Otavio,

I found out that there was a problem with cairo patch . I used append in the wrong place in PACKAGECONFIG_class-target_mx6. It is supposed to be PACKAGECONFIG_append_class-target_mx6q but I used it as PACKAGECONFIG_class-target_append_mx6q.

I will send the updated Cairo patch shortly.

Thanks,
Neena

-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Wednesday, August 20, 2014 12:11 PM
To: Busireddy Neena-B45787
Cc: meta-freescale@yoctoproject.org
Subject: Re: [meta-freescale] [meta-fsl-arm][PATCH v5 5/6] weston: Add sololite changes

On Mon, Aug 18, 2014 at 5:10 PM, Neena Busireddy <neena.busireddy@freescale.com> wrote:
> Sololite does not support 3D GPU hardware acceleration, so remove gles 
> flags from compilation.
>
> Also, included the patches to enable GAL2D compositor and change GAL2D 
> compositor to be default when EGL is not enabled in Sololite.
>
> Patch for crashes on touch device without a pointer is applicable for 
> all iMX6 machines.
>
> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>

Found following failure in our autobuilder:

wayland fsl-image-machine-test@imx6qsabresd (1/3) | configure: error:
cairo-egl not used because No package 'cairo-egl' found wayland fsl-image-machine-test@imx6qsabresd (1/3) | No package 'cairo-glesv2' found wayland fsl-image-machine-test@imx6qsabresd (1/3) | Configure failed.
The contents of all config.log files follows to aid debugging wayland fsl-image-machine-test@imx6qsabresd (1/3) | ERROR: oe_runconf failed wayland fsl-image-machine-test@imx6qsabresd (1/3) | WARNING: exit code
1 from a shell command.
wayland fsl-image-machine-test@imx6qsabresd (1/3) | ERROR: Function
failed: do_configure (log file is located at
.../build-wayland/tmp/work/cortexa9hf-vfp-neon-mx6-poky-linux-gnueabi/weston/1.5.0-r0/temp/log.do_configure.30855)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm][PATCH v5 4/6] glmark2: Create bbappend to include Sololite changes.

[Jacob Kroon]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

On Mon, Aug 18, 2014 at 10:10 PM, Neena Busireddy <
neena.busireddy@freescale.com> wrote:

> Remove gles2 from packageconfig for sololite as it does
> not support 3D GPU hardware acceleration.
>
> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
> ---
>  recipes-benchmark/glmark2/glmark2_%.bbappend |    3 +++
>  1 file changed, 3 insertions(+)
>  create mode 100644 recipes-benchmark/glmark2/glmark2_%.bbappend
>

The glmark2 recipe lives in meta-openembedded/meta-oe, which I'm not using,
so I get parsing errors due to this .bbappend.
Could we fix this somehow, for us that don't use meta-oe ?

[-- Attachment #2: Type: text/html, Size: 1044 bytes --]

Re: [meta-fsl-arm][PATCH v5 4/6] glmark2: Create bbappend to include Sololite changes.

[Otavio Salvador]

On Sat, Aug 23, 2014 at 1:53 PM, Jacob Kroon <jacob.kroon@gmail.com> wrote:
> On Mon, Aug 18, 2014 at 10:10 PM, Neena Busireddy
> <neena.busireddy@freescale.com> wrote:
>>
>> Remove gles2 from packageconfig for sololite as it does
>> not support 3D GPU hardware acceleration.
>>
>> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
>> ---
>>  recipes-benchmark/glmark2/glmark2_%.bbappend |    3 +++
>>  1 file changed, 3 insertions(+)
>>  create mode 100644 recipes-benchmark/glmark2/glmark2_%.bbappend
>
>
> The glmark2 recipe lives in meta-openembedded/meta-oe, which I'm not using,
> so I get parsing errors due to this .bbappend.
> Could we fix this somehow, for us that don't use meta-oe ?

This needs to be move to the collection openembedded-layer; can you
prepare a patch to fix it?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm][PATCH v5 4/6] glmark2: Create bbappend to include Sololite changes.

[Jacob Kroon]

[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]

On Sat, Aug 23, 2014 at 8:41 PM, Otavio Salvador <otavio@ossystems.com.br>
wrote:

> On Sat, Aug 23, 2014 at 1:53 PM, Jacob Kroon <jacob.kroon@gmail.com>
> wrote:
> > On Mon, Aug 18, 2014 at 10:10 PM, Neena Busireddy
> > <neena.busireddy@freescale.com> wrote:
> >>
> >> Remove gles2 from packageconfig for sololite as it does
> >> not support 3D GPU hardware acceleration.
> >>
> >> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
> >> ---
> >>  recipes-benchmark/glmark2/glmark2_%.bbappend |    3 +++
> >>  1 file changed, 3 insertions(+)
> >>  create mode 100644 recipes-benchmark/glmark2/glmark2_%.bbappend
> >
> >
> > The glmark2 recipe lives in meta-openembedded/meta-oe, which I'm not
> using,
> > so I get parsing errors due to this .bbappend.
> > Could we fix this somehow, for us that don't use meta-oe ?
>
> This needs to be move to the collection openembedded-layer; can you
> prepare a patch to fix it?
>
>
Ah, yes I understand now. Will send a patch.

[-- Attachment #2: Type: text/html, Size: 1706 bytes --]