-----Original Message-----
From: [email protected] [mailto:meta-arago-
[email protected]] On Behalf Of R, Karthik
Sent: Friday, October 31, 2014 10:43 AM
To: [email protected]
Subject: [meta-arago] [for master v3 4/4] weston: v1.3.0 for DRM based
backend (additional patches)
GLSDK specific additions to enable full functionality
On devices where the backend is chosen as DRM, as in the case of dra7xx,
there are some additional patches that are specific to the omapdrm which
are needed for basic functionality and some bug fixes.
This will fully enable
* multiple display support
* Handle screensavers more efficiently
* Be compatible with libgbm, TI adaptation of libgbm
* Install all the weston clients in the target filesystem.
Signed-off-by: Karthik Ramanan <[email protected]>
---
...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch | 26 +++++++++++
...e-Include-option-to-search-in-include-drm.patch | 47
++++++++++++++++++++
...urce-prevent-input-disable-during-repaint.patch | 34 ++++++++++++++
.../0005-temp-hack-to-enable-weston-1.3.patch | 33 ++++++++++++++
.../0006-weston-drm-Enable-multiple-displays.patch | 43
++++++++++++++++++
.../recipes-graphics/wayland/weston_1.3.0.bb | 32 ++++++++-----
6 files changed, 204 insertions(+), 11 deletions(-) create mode 100644
meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-
drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
create mode 100644 meta-arago-extras/recipes-
graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-
include-drm.patch
create mode 100644 meta-arago-extras/recipes-
graphics/wayland/weston/0003-input-source-prevent-input-disable-during-
repaint.patch
create mode 100644 meta-arago-extras/recipes-
graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
create mode 100644 meta-arago-extras/recipes-
graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0001-
compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch b/meta-
arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-
Change-path-of-gbm.h-to-gbm-gbm.h.patch
new file mode 100644
index 0000000..cd0581a
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0001-
compositor-
+++ drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
@@ -0,0 +1,26 @@
+From 5f655cb89813e39d6410493b4725e447212ea3a3 Mon Sep 17
00:00:00 2001
+From: Mrinmayee Hingolikar <[email protected]>
+Date: Tue, 24 Sep 2013 19:13:50 +0530
+Subject: [PATCH] compositor-drm: Change path of gbm.h to gbm/gbm.h
+
+Signed-off-by: Mrinmayee Hingolikar <[email protected]>
+---
+ src/compositor-drm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compositor-drm.c b/src/compositor-drm.c index
+f055118..7a59872 100644
+--- a/src/compositor-drm.c
++++ b/src/compositor-drm.c
+@@ -35,7 +35,7 @@
+ #include <xf86drmMode.h>
+ #include <drm_fourcc.h>
+
+-#include <gbm.h>
++#include <gbm/gbm.h>
+ #include <libbacklight.h>
+ #include <libudev.h>
+
+--
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0002-
Makefile-Include-option-to-search-in-include-drm.patch b/meta-arago-
extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-
search-in-include-drm.patch
new file mode 100644
index 0000000..557373d
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-
In
+++ clude-option-to-search-in-include-drm.patch
@@ -0,0 +1,47 @@
+From c8b6fe71ad0231c4787836f4156e604cedfe45a8 Mon Sep 17 00:00:00
2001
+From: Mrinmayee Hingolikar <[email protected]>
+Date: Thu, 3 Jul 2014 15:06:31 +0530
+Subject: [PATCH] Makefile change to search for correct drm headers
+
+Signed-off-by: Mrinmayee Hingolikar <[email protected]>
+---
+ src/Makefile.am | 3 ++-
+ tests/Makefile.am | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am index 749c074..a6e44e7
+100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,6 +2,7 @@ bin_PROGRAMS = weston \
+ $(weston_launch)
+
+ AM_CPPFLAGS = \
++ $(DRM_COMPOSITOR_CFLAGS) \
+ -I$(top_srcdir)/shared \
+ -DDATADIR='"$(datadir)"' \
+ -DMODULEDIR='"$(moduledir)"' \
+@@ -9,7 +10,7 @@ AM_CPPFLAGS = \
+ -DIN_WESTON
+
+ weston_LDFLAGS = -export-dynamic
+-weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
$(LIBUNWIND_CFLAGS)
++weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
$(LIBUNWIND_CFLAGS)
+ weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
+ $(DLOPEN_LIBS) -lm ../shared/libshared.la
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am index
+5be52c6..42ebd2b 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -47,6 +47,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/shared \
+ -I$(top_builddir)/src \
+ -DUNIT_TEST \
++ $(DRM_COMPOSITOR_CFLAGS) \
+ $(COMPOSITOR_CFLAGS)
+
+ surface_global_test_la_SOURCES = surface-global-test.c
+--
+2.0.1
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0003-
input-source-prevent-input-disable-during-repaint.patch b/meta-arago-
extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-
disable-during-repaint.patch
new file mode 100644
index 0000000..74e82fb
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-
sourc
+++ e-prevent-input-disable-during-repaint.patch
@@ -0,0 +1,34 @@
+From cdd9043580e0f0a6c60c21b955f1966c78b2098b Mon Sep 17 00:00:00
2001
+From: Karthik Ramanan <[email protected]>
+Date: Mon, 2 Dec 2013 15:52:41 +0530
+Subject: [PATCH] input source: prevent input disable during repaint
+
+Under certain race conditions, the input source was getting disabled
+which was preventing the evdev events from keyboard or mouse to reach
+Weston. The side effect of this issue was that after the screen gets
+locked, it was not possible to come to Weston desktop without killing
+Weston.
+
+Signed-off-by: Karthik Ramanan <[email protected]>
+---
+ src/compositor.c | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/compositor.c b/src/compositor.c index 0e0835f..ced3883
+100644
+--- a/src/compositor.c
++++ b/src/compositor.c
+@@ -1084,10 +1084,6 @@ weston_output_schedule_repaint(struct
weston_output *output)
+ wl_event_loop_add_idle(loop, idle_repaint, output);
+ output->repaint_scheduled = 1;
+
+- if (compositor->input_loop_source) {
+- wl_event_source_remove(compositor->input_loop_source);
+- compositor->input_loop_source = NULL;
+- }
+ }
+
+ WL_EXPORT void
+--
+1.7.0.4
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0005-
temp-hack-to-enable-weston-1.3.patch b/meta-arago-extras/recipes-
graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
new file mode 100644
index 0000000..0c860b3
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-
hack-t
+++ o-enable-weston-1.3.patch
@@ -0,0 +1,33 @@
+From 518fe5aea452a4660e07855716349a0c84e59b14 Mon Sep 17
00:00:00 2001
+From: Karthik Ramanan <[email protected]>
+Date: Tue, 21 Jan 2014 11:48:19 +0000
+Subject: [PATCH] temp-hack: to enable weston 1.3
+
+This patch resolves the issue with the black display seen when running
+weston 1.3 version on the dra7xx target.
+
+Known issues:
+1. simple-egl application does not work 2. weston on multiple displays
+does not work
+
+Signed-off-by: Karthik Ramanan <[email protected]>
+---
+ src/compositor-drm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compositor-drm.c b/src/compositor-drm.c index
+0ac5efa..dd28f0f 100644
+--- a/src/compositor-drm.c
++++ b/src/compositor-drm.c
+@@ -616,7 +616,7 @@ drm_output_repaint(struct weston_output
*output_base,
+ .request.sequence = 1,
+ };
+
+- if ((!s->current && !s->next) ||
++ if ((!s->current && !s->next) &&
+ !drm_sprite_crtc_supported(output_base, s-
possible_crtcs))
+ continue;
+
+--
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0006-
weston-drm-Enable-multiple-displays.patch b/meta-arago-extras/recipes-
graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
new file mode 100644
index 0000000..abc4295
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-
drm-
+++ Enable-multiple-displays.patch
@@ -0,0 +1,43 @@
+From dce69cadd858bd959dd41edf82860cd370ca1fa8 Mon Sep 17 00:00:00
2001
+From: Karthik Ramanan <[email protected]>
+Date: Fri, 14 Mar 2014 18:55:12 +0530
+Subject: [PATCH] weston-drm: Enable multiple displays
+
+We are currently seeing an issue with missing VBlanks for LCD and HDMI
+connectors which leads to display not getting refreshed.
+This patch can be considered as a workaround.
+
+Signed-off-by: Karthik Ramanan <[email protected]>
+---
+ src/compositor-drm.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/compositor-drm.c b/src/compositor-drm.c index
+79dcc6c..ef2fbd2 100644
+--- a/src/compositor-drm.c
++++ b/src/compositor-drm.c
+@@ -709,6 +709,7 @@ page_flip_handler(int fd, unsigned int frame, {
+ struct drm_output *output = (struct drm_output *) data;
+ uint32_t msecs;
++ uint32_t bail;
+
+ /* We don't set page_flip_pending on start_repaint_loop, in that
case
+ * we just want to page flip to the current buffer to get an accurate
+@@ -721,7 +722,12 @@ page_flip_handler(int fd, unsigned int frame,
+
+ output->page_flip_pending = 0;
+
+- if (!output->vblank_pending) {
++ if (output->vblank_pending) {
++ weston_log("VBlank is pending for connector = %d, frame =
%d\n", output->connector_id, frame);
++ bail = 1;
++ }
++
++ if (!output->vblank_pending || bail) {
+ msecs = sec * 1000 + usec / 1000;
+ weston_output_finish_frame(&output->base, msecs);
+
+--
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
index eb38ce1..cf81a33 100644
--- a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
+++ b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
@@ -5,17 +5,28 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b885
0c"
-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+SRC_URI = "git://anongit.freedesktop.org/wayland/weston;protocol=git \
file://weston.png \
- file://weston.desktop"
-SRC_URI[md5sum] = "29ad994dd5ea07f52d7bffb24c25d9f7"
-SRC_URI[sha256sum] =
"8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a
0"
+ file://weston.desktop \
+ file://0001-compositor-drm-Change-path-of-gbm.h-to-gbm-
gbm.h.patch \
+ file://0002-Makefile-Include-option-to-search-in-include-drm.patch \
+ file://0003-input-source-prevent-input-disable-during-repaint.patch
\
+ file://0005-temp-hack-to-enable-weston-1.3.patch \
+ file://0006-weston-drm-Enable-multiple-displays.patch "
+S = "${WORKDIR}/git"
+
+SRCREV = "95659c03219b057d9d703b04cf89bc0329ce947a"
+
+PR = "r2"
+
inherit autotools pkgconfig useradd
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland virtual/mesa virtual/egl pango"
+DEPENDS += "wayland libgbm virtual/egl pango"
+
+COMPATIBLE_MACHINE = "dra7xx-evm"
