* [for master v3 0/4] wayland/weston 1.3.0 for DRM backends
@ 2014-10-31 15:43 Karthik Ramanan
2014-10-31 15:43 ` [for master v3 1/4] wayland: Introduce 1.3.0 for DRM based backend Karthik Ramanan
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Karthik Ramanan @ 2014-10-31 15:43 UTC (permalink / raw)
To: meta-arago
This is the version 3 of the patches that were reworked based on
earlier review comments. Intentionally setting the compatible
machine to dra7xx-evm as this is currently GLSDK specific but
can be used for other platforms as needed.
Karthik Ramanan (4):
wayland: Introduce 1.3.0 for DRM based backend
wayland: GLSDK specific adaptions
weston: version 1.3.0 for DRM backend
weston: v1.3.0 for DRM based backend (additional patches)
.../wayland/{wayland_1.6.0.bb => wayland_1.3.0.bb} | 23 +++--
...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 | 90 ++++++++++++++++++++
7 files changed, 284 insertions(+), 12 deletions(-)
copy meta-arago-extras/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.3.0.bb} (68%)
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
create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
--
1.7.9.5
^ permalink raw reply [flat|nested] 9+ messages in thread* [for master v3 1/4] wayland: Introduce 1.3.0 for DRM based backend 2014-10-31 15:43 [for master v3 0/4] wayland/weston 1.3.0 for DRM backends Karthik Ramanan @ 2014-10-31 15:43 ` Karthik Ramanan 2014-10-31 15:43 ` [for master v3 2/4] wayland: GLSDK specific adaptions Karthik Ramanan ` (2 subsequent siblings) 3 siblings, 0 replies; 9+ messages in thread From: Karthik Ramanan @ 2014-10-31 15:43 UTC (permalink / raw) To: meta-arago This recipe is coming from oe-core Signed-off-by: Karthik Ramanan <a0393906@ti.com> --- .../recipes-graphics/wayland/wayland_1.3.0.bb | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb new file mode 100644 index 0000000..212e08a --- /dev/null +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Wayland, a protocol between a compositor and clients" +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ +as well as a C library implementation of that protocol. The compositor can be \ +a standalone display server running on Linux kernel modesetting and evdev \ +input devices, an X application, or a wayland client itself. The clients can \ +be traditional applications, X servers (rootless or fullscreen) or other \ +display servers." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ + file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc" +SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" + +SRC_URI_append_class-native = " file://just-scanner.patch" + +inherit autotools pkgconfig + +# We need wayland-native for the wayland-scanner utility +BBCLASSEXTEND = "native" + +DEPENDS_virtclass-native = "expat-native libffi-native" +DEPENDS = "expat libffi wayland-native" + +EXTRA_OECONF_virtclass-native = "--disable-documentation" +EXTRA_OECONF = "--disable-documentation --disable-scanner" + +# Wayland installs a M4 macro for other projects to use, which uses the target +# pkg-config to find files. Replace pkg-config with pkg-config-native. +do_install_append_class-native() { + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ + -e 's,$PKG_CONFIG,pkg-config-native,g' \ + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 +} -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [for master v3 2/4] wayland: GLSDK specific adaptions 2014-10-31 15:43 [for master v3 0/4] wayland/weston 1.3.0 for DRM backends Karthik Ramanan 2014-10-31 15:43 ` [for master v3 1/4] wayland: Introduce 1.3.0 for DRM based backend Karthik Ramanan @ 2014-10-31 15:43 ` Karthik Ramanan 2014-10-31 15:43 ` [for master v3 3/4] weston: version 1.3.0 for DRM backend Karthik Ramanan 2014-10-31 15:43 ` [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) Karthik Ramanan 3 siblings, 0 replies; 9+ messages in thread From: Karthik Ramanan @ 2014-10-31 15:43 UTC (permalink / raw) To: meta-arago * Switch to git * Update source directory Signed-off-by: Karthik Ramanan <a0393906@ti.com> --- .../recipes-graphics/wayland/wayland_1.3.0.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb index 212e08a..ae68dac 100644 --- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb @@ -10,9 +10,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc" -SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" + +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git" +SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d" + +S = "${WORKDIR}/git" + +PR = "r1" SRC_URI_append_class-native = " file://just-scanner.patch" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [for master v3 3/4] weston: version 1.3.0 for DRM backend 2014-10-31 15:43 [for master v3 0/4] wayland/weston 1.3.0 for DRM backends Karthik Ramanan 2014-10-31 15:43 ` [for master v3 1/4] wayland: Introduce 1.3.0 for DRM based backend Karthik Ramanan 2014-10-31 15:43 ` [for master v3 2/4] wayland: GLSDK specific adaptions Karthik Ramanan @ 2014-10-31 15:43 ` Karthik Ramanan 2014-10-31 15:43 ` [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) Karthik Ramanan 3 siblings, 0 replies; 9+ messages in thread From: Karthik Ramanan @ 2014-10-31 15:43 UTC (permalink / raw) To: meta-arago This recipe is coming from oe-core Signed-off-by: Karthik Ramanan <a0393906@ti.com> --- .../recipes-graphics/wayland/weston_1.3.0.bb | 80 ++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb 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 new file mode 100644 index 0000000..eb38ce1 --- /dev/null +++ b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb @@ -0,0 +1,80 @@ +SUMMARY = "Weston, a Wayland compositor" +DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ + file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://weston.png \ + file://weston.desktop" +SRC_URI[md5sum] = "29ad994dd5ea07f52d7bffb24c25d9f7" +SRC_URI[sha256sum] = "8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0" + + +inherit autotools pkgconfig useradd + +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" +DEPENDS += "wayland virtual/mesa virtual/egl pango" + +EXTRA_OECONF = "--enable-setuid-install \ + --disable-tablet-shell \ + --disable-xwayland \ + --enable-simple-clients \ + --enable-clients \ + --enable-demo-clients \ + --disable-simple-egl-clients \ + --disable-libunwind \ + --disable-rpi-compositor \ + --disable-rdp-compositor" + + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ + " +# +# Compositor choices +# +# Weston on KMS +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev" +# Weston on Wayland (nested Weston) +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" +# Weston on X11 +PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" +# Headless Weston +PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" +# Weston on framebuffer +PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" +# weston-launch +PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam" +# VA-API desktop recorder +PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" + +do_install_append() { + # Weston doesn't need the .la files to load modules, so wipe them + rm -f ${D}/${libdir}/weston/*.la + + for feature in ${DISTRO_FEATURES}; do + # If X11, ship a desktop file to launch it + if [ "$feature" = "x11" ]; then + install -d ${D}${datadir}/applications + install ${WORKDIR}/weston.desktop ${D}${datadir}/applications + + install -d ${D}${datadir}/icons/hicolor/48x48/apps + install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps + fi + done +} + +PACKAGES += "${PN}-examples" + +FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}" +FILES_${PN}-examples = "${bindir}/*" + +RDEPENDS_${PN} += "xkeyboard-config" +RRECOMMENDS_${PN} = "liberation-fonts" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system weston-launch" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) 2014-10-31 15:43 [for master v3 0/4] wayland/weston 1.3.0 for DRM backends Karthik Ramanan ` (2 preceding siblings ...) 2014-10-31 15:43 ` [for master v3 3/4] weston: version 1.3.0 for DRM backend Karthik Ramanan @ 2014-10-31 15:43 ` Karthik Ramanan 2014-10-31 16:08 ` Cooper Jr., Franklin 3 siblings, 1 reply; 9+ messages in thread From: Karthik Ramanan @ 2014-10-31 15:43 UTC (permalink / raw) To: meta-arago 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 <a0393906@ti.com> --- ...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 <mrinmayee@ti.com> +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 <mrinmayee@ti.com> +--- + 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-Include-option-to-search-in-include-drm.patch @@ -0,0 +1,47 @@ +From c8b6fe71ad0231c4787836f4156e604cedfe45a8 Mon Sep 17 00:00:00 2001 +From: Mrinmayee Hingolikar <mrinmayee@ti.com> +Date: Thu, 3 Jul 2014 15:06:31 +0530 +Subject: [PATCH] Makefile change to search for correct drm headers + +Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com> +--- + 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-source-prevent-input-disable-during-repaint.patch @@ -0,0 +1,34 @@ +From cdd9043580e0f0a6c60c21b955f1966c78b2098b Mon Sep 17 00:00:00 2001 +From: Karthik Ramanan <a0393906@ti.com> +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 <a0393906@ti.com> +--- + 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-to-enable-weston-1.3.patch @@ -0,0 +1,33 @@ +From 518fe5aea452a4660e07855716349a0c84e59b14 Mon Sep 17 00:00:00 2001 +From: Karthik Ramanan <a0393906@ti.com> +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 <a0393906@ti.com> +--- + 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 <a0393906@ti.com> +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 <a0393906@ti.com> +--- + 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=aa98a8db03480fe7d500d0b1f4b8850c" -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] = "8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0" + 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" EXTRA_OECONF = "--enable-setuid-install \ --disable-tablet-shell \ @@ -23,7 +34,6 @@ EXTRA_OECONF = "--enable-setuid-install \ --enable-simple-clients \ --enable-clients \ --enable-demo-clients \ - --disable-simple-egl-clients \ --disable-libunwind \ --disable-rpi-compositor \ --disable-rdp-compositor" @@ -38,9 +48,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', # Compositor choices # # Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev" +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev" # Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,libgbm" # Weston on X11 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" # Headless Weston @@ -66,15 +76,15 @@ do_install_append() { install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps fi done + } -PACKAGES += "${PN}-examples" -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}" -FILES_${PN}-examples = "${bindir}/*" +FILES_${PN} = "${bindir}/* ${libexecdir} ${datadir}" RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system weston-launch" + -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) 2014-10-31 15:43 ` [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) Karthik Ramanan @ 2014-10-31 16:08 ` Cooper Jr., Franklin 2014-10-31 16:18 ` Karthik Ramanan 0 siblings, 1 reply; 9+ messages in thread From: Cooper Jr., Franklin @ 2014-10-31 16:08 UTC (permalink / raw) To: R, Karthik, meta-arago@arago-project.org > -----Original Message----- > From: meta-arago-bounces@arago-project.org [mailto:meta-arago- > bounces@arago-project.org] On Behalf Of R, Karthik > Sent: Friday, October 31, 2014 10:43 AM > To: meta-arago@arago-project.org > 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 <a0393906@ti.com> > --- > ...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 <mrinmayee@ti.com> > +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 <mrinmayee@ti.com> > +--- > + 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 <mrinmayee@ti.com> > +Date: Thu, 3 Jul 2014 15:06:31 +0530 > +Subject: [PATCH] Makefile change to search for correct drm headers > + > +Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com> > +--- > + 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 <a0393906@ti.com> > +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 <a0393906@ti.com> > +--- > + 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 <a0393906@ti.com> > +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 <a0393906@ti.com> > +--- > + 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 <a0393906@ti.com> > +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 <a0393906@ti.com> > +--- > + 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" [Franklin] Can all of this work on am57x? If so can we add that machine to the compatible field or maybe set this to the generic SOC family? > > EXTRA_OECONF = "--enable-setuid-install \ > --disable-tablet-shell \ @@ -23,7 +34,6 @@ EXTRA_OECONF = "-- > enable-setuid-install \ > --enable-simple-clients \ > --enable-clients \ > --enable-demo-clients \ > - --disable-simple-egl-clients \ > --disable-libunwind \ > --disable-rpi-compositor \ > --disable-rdp-compositor" > @@ -38,9 +48,9 @@ PACKAGECONFIG ??= > "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', # > Compositor choices # # Weston on KMS -PACKAGECONFIG[kms] = "-- > enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev" > +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm- > compositor,drm udev libgbm mtdev" > # Weston on Wayland (nested Weston) > -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable- > wayland-compositor,mesa" > +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable- > wayland-compositor,libgbm" > # Weston on X11 > PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11- > compositor,virtual/libx11 libxcb libxcb libxcursor cairo" > # Headless Weston > @@ -66,15 +76,15 @@ do_install_append() { > install ${WORKDIR}/weston.png > ${D}${datadir}/icons/hicolor/48x48/apps > fi > done > + > } > > -PACKAGES += "${PN}-examples" > > -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal > ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode > ${libexecdir} ${datadir}" > -FILES_${PN}-examples = "${bindir}/*" > +FILES_${PN} = "${bindir}/* ${libexecdir} ${datadir}" > > RDEPENDS_${PN} += "xkeyboard-config" > RRECOMMENDS_${PN} = "liberation-fonts" > > USERADD_PACKAGES = "${PN}" > GROUPADD_PARAM_${PN} = "--system weston-launch" > + > -- > 1.7.9.5 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) 2014-10-31 16:08 ` Cooper Jr., Franklin @ 2014-10-31 16:18 ` Karthik Ramanan 2014-10-31 16:59 ` Denys Dmytriyenko 0 siblings, 1 reply; 9+ messages in thread From: Karthik Ramanan @ 2014-10-31 16:18 UTC (permalink / raw) To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org, R, Karthik On 31-Oct-14 9:38 PM, Cooper Jr., Franklin wrote: >> -----Original Message----- >> From: meta-arago-bounces@arago-project.org [mailto:meta-arago- >> bounces@arago-project.org] On Behalf Of R, Karthik >> Sent: Friday, October 31, 2014 10:43 AM >> To: meta-arago@arago-project.org >> 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 <a0393906@ti.com> >> --- >> ...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 <mrinmayee@ti.com> >> +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 <mrinmayee@ti.com> >> +--- >> + 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 <mrinmayee@ti.com> >> +Date: Thu, 3 Jul 2014 15:06:31 +0530 >> +Subject: [PATCH] Makefile change to search for correct drm headers >> + >> +Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com> >> +--- >> + 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 <a0393906@ti.com> >> +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 <a0393906@ti.com> >> +--- >> + 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 <a0393906@ti.com> >> +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 <a0393906@ti.com> >> +--- >> + 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 <a0393906@ti.com> >> +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 <a0393906@ti.com> >> +--- >> + 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" > [Franklin] Can all of this work on am57x? If so can we add that machine to the compatible field or maybe set this to the generic SOC family? Franklin, Potentially yes, but note that the kernel needs to have all the patches for the DRM module for everything to work. So I have very conservatively set the compatible machine to dra7xx-evm for moment. I also had a look at the x15 board today and it seems like the multiple display support is not present on x15 (correct?). So you may only need a subset of the patches here. In a few weeks, I will try to bring up the weston 1.6.0 with the DRM backend. At that point of time we can remove this and may be that might be more suited for am57xx. >> >> EXTRA_OECONF = "--enable-setuid-install \ >> --disable-tablet-shell \ @@ -23,7 +34,6 @@ EXTRA_OECONF = "-- >> enable-setuid-install \ >> --enable-simple-clients \ >> --enable-clients \ >> --enable-demo-clients \ >> - --disable-simple-egl-clients \ >> --disable-libunwind \ >> --disable-rpi-compositor \ >> --disable-rdp-compositor" >> @@ -38,9 +48,9 @@ PACKAGECONFIG ??= >> "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', # >> Compositor choices # # Weston on KMS -PACKAGECONFIG[kms] = "-- >> enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev" >> +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm- >> compositor,drm udev libgbm mtdev" >> # Weston on Wayland (nested Weston) >> -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable- >> wayland-compositor,mesa" >> +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable- >> wayland-compositor,libgbm" >> # Weston on X11 >> PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11- >> compositor,virtual/libx11 libxcb libxcb libxcursor cairo" >> # Headless Weston >> @@ -66,15 +76,15 @@ do_install_append() { >> install ${WORKDIR}/weston.png >> ${D}${datadir}/icons/hicolor/48x48/apps >> fi >> done >> + >> } >> >> -PACKAGES += "${PN}-examples" >> >> -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal >> ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode >> ${libexecdir} ${datadir}" >> -FILES_${PN}-examples = "${bindir}/*" >> +FILES_${PN} = "${bindir}/* ${libexecdir} ${datadir}" >> >> RDEPENDS_${PN} += "xkeyboard-config" >> RRECOMMENDS_${PN} = "liberation-fonts" >> >> USERADD_PACKAGES = "${PN}" >> GROUPADD_PARAM_${PN} = "--system weston-launch" >> + >> -- >> 1.7.9.5 >> >> _______________________________________________ >> meta-arago mailing list >> meta-arago@arago-project.org >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) 2014-10-31 16:18 ` Karthik Ramanan @ 2014-10-31 16:59 ` Denys Dmytriyenko 2014-10-31 17:12 ` Karthik Ramanan 0 siblings, 1 reply; 9+ messages in thread From: Denys Dmytriyenko @ 2014-10-31 16:59 UTC (permalink / raw) To: Karthik Ramanan Cc: meta-arago@arago-project.org, R, Karthik, Cooper Jr., Franklin On Fri, Oct 31, 2014 at 09:48:37PM +0530, Karthik Ramanan wrote: > On 31-Oct-14 9:38 PM, Cooper Jr., Franklin wrote: > >> 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" > >[Franklin] Can all of this work on am57x? If so can we add that machine to > >the compatible field or maybe set this to the generic SOC family? > > Franklin, > > Potentially yes, but note that the kernel needs to have all the > patches for the DRM module for everything to work. So I have very > conservatively set the compatible machine to dra7xx-evm for moment. > > I also had a look at the x15 board today and it seems like the multiple > display support is not present on x15 (correct?). So you may only > need a subset of the patches here. > > In a few weeks, I will try to bring up the weston 1.6.0 with the DRM > backend. At that point of time we can remove this and may be that > might be more suited for am57xx. Karthik, That would be great if we could consolidate on a single version of Wayland and Weston! Please let me know if you need any help with that. -- Denys ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) 2014-10-31 16:59 ` Denys Dmytriyenko @ 2014-10-31 17:12 ` Karthik Ramanan 0 siblings, 0 replies; 9+ messages in thread From: Karthik Ramanan @ 2014-10-31 17:12 UTC (permalink / raw) To: Denys Dmytriyenko Cc: meta-arago@arago-project.org, R, Karthik, Cooper Jr., Franklin On 31-Oct-14 10:29 PM, Denys Dmytriyenko wrote: > On Fri, Oct 31, 2014 at 09:48:37PM +0530, Karthik Ramanan wrote: >> On 31-Oct-14 9:38 PM, Cooper Jr., Franklin wrote: >>>> 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" > >>> [Franklin] Can all of this work on am57x? If so can we add that machine to >>> the compatible field or maybe set this to the generic SOC family? >> >> Franklin, >> >> Potentially yes, but note that the kernel needs to have all the >> patches for the DRM module for everything to work. So I have very >> conservatively set the compatible machine to dra7xx-evm for moment. >> >> I also had a look at the x15 board today and it seems like the multiple >> display support is not present on x15 (correct?). So you may only >> need a subset of the patches here. >> >> In a few weeks, I will try to bring up the weston 1.6.0 with the DRM >> backend. At that point of time we can remove this and may be that >> might be more suited for am57xx. > > Karthik, > > That would be great if we could consolidate on a single version of Wayland and > Weston! Please let me know if you need any help with that. > Denys, That's the final objective. We going to start working towards that. As you understand that the kernel dependency needs to be sorted out before that. If there is no other feedback on this patch, it would be good to have this merged to the daisy as an interim. When we do add support for DRM backend on 1.6.0, I will take action to remove support for 1.3.0. For those how want to use this version can set the preferred_provider to this version. Regards Karthik ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-10-31 17:12 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-10-31 15:43 [for master v3 0/4] wayland/weston 1.3.0 for DRM backends Karthik Ramanan 2014-10-31 15:43 ` [for master v3 1/4] wayland: Introduce 1.3.0 for DRM based backend Karthik Ramanan 2014-10-31 15:43 ` [for master v3 2/4] wayland: GLSDK specific adaptions Karthik Ramanan 2014-10-31 15:43 ` [for master v3 3/4] weston: version 1.3.0 for DRM backend Karthik Ramanan 2014-10-31 15:43 ` [for master v3 4/4] weston: v1.3.0 for DRM based backend (additional patches) Karthik Ramanan 2014-10-31 16:08 ` Cooper Jr., Franklin 2014-10-31 16:18 ` Karthik Ramanan 2014-10-31 16:59 ` Denys Dmytriyenko 2014-10-31 17:12 ` Karthik Ramanan
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.