From 93f724675d9c47d48ea56d82843e162a12ac41b4 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 30 Nov 2020 19:17:29 -0500 Subject: meta-agl-profile-graphical: add device dependency hook in weston-init Add a mechanism in the weston-init recipe to allow machine templates to trigger installation of a systemd drop-in that adds a DRM device dependency for the weston@.service unit. Also, tweak the qemux86-64 configuration to enable doing so against dev-dri-card0.device to avoid startup failures due to the slow i915 initialization on e.g. the UpSquared. This approach has been taken since it seems safer for now to only apply it for qemux86-64 than doing a blanket default that might then need to be over-ridden for vendor BSPs. Bug-AGL: SPEC-3518 Signed-off-by: Scott Murray Change-Id: I74ce4f878f9aa3f0d555f96a79578f3d8ca72550 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25675 ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account --- .../recipes-graphics/wayland/weston-init.bbappend | 14 ++++++++++++++ .../wayland/weston-init/weston-dep.conf.in | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston-dep.conf.in (limited to 'meta-agl-profile-graphical') diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend index 374e9aa75..b3fecec22 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend @@ -7,8 +7,16 @@ AGL_DEFAULT_WESTONSTART ??= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/ WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}" WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/compositor.log", "",d)}" +# Systemd name of DRM device to have weston/agl-compositor startup depend +# upon, if required. Currently only x86-64 seems to need a dependency to +# avoid failures due to racing with i915 driver init on e.g. UpSquared. +# It seems safer for now to only apply it there rather than doing a blanket +# default everywhere that might then need to be over-ridden for vendor BSPs. +WESTON_DRM_DEVICE ?= "" + WIFILES = " \ file://weston.conf.in \ + file://weston-dep.conf.in \ file://tmpfiles.conf.in \ file://zz-dri.rules.in \ file://zz-input.rules.in \ @@ -37,6 +45,7 @@ do_install_append() { -e "s,@WESTONGROUP@,${WESTONGROUP},g" \ -e "s,@XDG_RUNTIME_DIR@,${DISPLAY_XDG_RUNTIME_DIR},g" \ -e "s,@WESTONSTART@,${WESTONSTART},g" \ + -e "s,@WESTON_DRM_DEVICE@,${WESTON_DRM_DEVICE},g" \ ${WORKDIR}/${f} > ${WORKDIR}/${g} fi done @@ -45,6 +54,11 @@ do_install_append() { install -d ${D}${systemd_system_unitdir}/weston@.service.d install -m644 ${WORKDIR}/weston.conf ${D}/${systemd_system_unitdir}/weston@.service.d/weston-init.conf + # Install weston DRM device dependency drop-in if required + if [ -n "${WESTON_DRM_DEVICE}" ]; then + install -m 0644 ${WORKDIR}/weston-dep.conf ${D}/${systemd_system_unitdir}/weston@.service.d/ + fi + # Install tmpfiles drop-in install -d ${D}${libdir}/tmpfiles.d install -m644 ${WORKDIR}/tmpfiles.conf ${D}${libdir}/tmpfiles.d/weston-init.conf diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston-dep.conf.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston-dep.conf.in new file mode 100644 index 000000000..2b8102096 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston-dep.conf.in @@ -0,0 +1,3 @@ +[Unit] +Requires=@WESTON_DRM_DEVICE@ +After=@WESTON_DRM_DEVICE@ -- cgit 1.2.3-korg