From 9f7e8f120dfeddd8b49eb4d232253cc3f9ac8efa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 10 Oct 2013 23:05:25 +0200 Subject: [PATCH] package/weston: add RPi compositor Procedure highly inspired by: http://wayland.freedesktop.org/raspberrypi.html The resulting weston works almost flawlessly, but requires a bit of love: - /boot/config.txt must include this line: dispmanx_offline=1 - at least 128MiB of RAM must be allocated to the GPU - after 24-or-so terminal-clients are connected, the screen turns black. Exiting a client restores the screen It seems increasing/decreasing the amount of memory allocated to the GPU makes the clients limit to wobble above/below 24 clients at a time. YMMV, as they say... Without dispmanx_offline=1, the limit is much below 24, at around 13. But changing the amount of memory allocated to the GPU does not change this limit in this case. YMMV, again. Anyway, there are not many different clients available, besides the terminal client, since all other clients are EGL-based, and there is (yet) no EGL support (for weston!) on the RPi. So the tests were made only with the terminal client. The system is rather smooth, but spwaning too many clients in a rapid-fire is sure to exhibit some lag. Resizing windows is a bit jerky, but moving them along is fine. Note: the config option has a depends on THREADS due to rpi-userland, even though weston itself already inherits the same dependency from wayland. But better be clean and safe. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 9 +++++++++ package/weston/weston.mk | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 0f168acb43..4532c28a2d 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -36,4 +36,13 @@ config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor" default y +config BR2_PACKAGE_WESTON_RPI + bool "RPi compositor" + depends on BR2_arm # rpi-userland + depends on BR2_INSTALL_LIBSTDCPP # rpi-userland + depends on BR2_LARGEFILE # rpi-userland + depends on BR2_TOOLCHAIN_HAS_THREADS # rpi-userland + select BR2_PACKAGE_RPI_USERLAND + select BR2_PACKAGE_WESTON_HAS_COMPOSITOR + endif diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6b4dece1f4..c8b47a7d3f 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -24,8 +24,8 @@ WESTON_CONF_OPT = \ --disable-drm-compositor \ --disable-wayland-compositor \ --disable-headless-compositor \ - --disable-rpi-compositor \ --disable-weston-launch \ + --disable-colord \ --disable-libunwind ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) @@ -34,4 +34,16 @@ else WESTON_CONF_OPT += --disable-fbdev-compositor endif +ifeq ($(BR2_PACKAGE_WESTON_RPI),y) +WESTON_DEPENDENCIES += rpi-userland +WESTON_CONF_OPT += --enable-rpi-compositor \ + --disable-resize-optimization \ + --disable-setuid-install \ + --disable-xwayland-test \ + --disable-simple-egl-clients \ + WESTON_NATIVE_BACKEND=rpi-backend.so +else +WESTON_CONF_OPT += --disable-rpi-compositor +endif # BR2_PACKAGE_WESTON_RPI + $(eval $(autotools-package)) -- 2.30.2