summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2017-01-25 17:36:43 -0500
committerScott Murray <scott.murray@konsulko.com>2017-01-25 17:46:48 -0500
commit301c9b323616ff0a0e41d0fd1178c1f2029e44e9 (patch)
treec3d1bdfe12d3847e523ee4bb13623421e05ebe12
parent973e9f133a6bbf1fdfe9110e529d15995867137a (diff)
Disable Weston DRM backend in QEMUchinook_3.0.1chinook/3.0.13.0.1
Since the Weston DRM backend does not work with the video card implementations in VirtualBox and VMWare player, and has some outstanding issues on QEMU that have resulted in GenIVI not enabling it[1], disable it for now. A comment has been added to the QEMU weston.ini indicating that the DRM backend can be re-enabled to potentially gain higher performance. Additionally, the common weston.service systemd unit has been modified to add the --tty option to weston-launch to start weston on /dev/tty1. This is now required to avoid console messages writing on top of the HomeScreen in QEMU, and is harmless to operation on the other platforms. [1]: https://github.com/GENIVI/meta-genivi-dev/pull/34 Bug-AGL: SPEC-405 Change-Id: Ic0c0adeb15baf392e3ffa0bbd26c62d060df1ef5 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini5
-rw-r--r--meta-agl/recipes-graphics/wayland/weston/weston.service2
2 files changed, 5 insertions, 2 deletions
diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini b/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini
index e380bf1b3..9c5ddd2d3 100644
--- a/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini
+++ b/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini
@@ -1,6 +1,9 @@
[core]
shell=ivi-shell.so
-backend=drm-backend.so
+# DRM backend disabled for now to allow compatibility with VirtualBox
+# and VMWare Player. It may be re-enabled if running on QEMU for
+# potentially increased performance.
+#backend=drm-backend.so
[ivi-shell]
ivi-module=ivi-controller.so,wl-shell-emulator.so
diff --git a/meta-agl/recipes-graphics/wayland/weston/weston.service b/meta-agl/recipes-graphics/wayland/weston/weston.service
index 295c3a95c..afd8a7db8 100644
--- a/meta-agl/recipes-graphics/wayland/weston/weston.service
+++ b/meta-agl/recipes-graphics/wayland/weston/weston.service
@@ -4,7 +4,7 @@ Conflicts=getty@tty1.service
After=dbus.service
[Service]
-ExecStart=/usr/bin/weston-launch -u root -- --idle-time=4294967
+ExecStart=/usr/bin/weston-launch --tty /dev/tty1 --user root -- --idle-time=4294967
ExecStop=/usr/bin/killall -s KILL weston
Type=simple