Skip to contentSkip to conversation

virgl: enable in qemu when 'opengl' is in DISTRO_FEATURES

PATCH In review Alexander Kanavin 1 participant 5 messages Jan 23, 2020

lore
Share & tools
lore
#0 lore raw

cover virgl: enable in qemu when 'opengl' is in DISTRO_FEATURES

virgl is a virtualized accelerated 3D graphics support for the qemu guests. This patchset enables virgl in qemu, when 'opengl' is in DISTRO_FEATURES.

This adds a few native dependencies to qemu-system-native (particularly, libdrm, virglrenderer and a special minimal configuration of mesa-native). I tested the impact on build times: it is about 30 seconds on a 16 core machine. 'bitbake core-image-minimal' goes from 25m26s to 25m57s.

The following changes since commit ca3993cc4b13d4e661228cee6fb9448adfd0a4ba:

bitbake: tests/fetch: Allow wget upgrade tests to run against a local server (2020-01-22 15:56:39 +0000)

are available in the Git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/qemu-split-virgl-gtk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/qemu-split-virgl-gtk

Alexander Kanavin (3):
bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk
from target
libsdl2: enable opengl option for native/nativesdk, subject to
'opengl' in DISTRO_FEATURES
qemu: enable virglrenderer and glx options subject to 'opengl'
DISTRO_FEATURE

 meta/conf/bitbake.conf                         |  4 ++--
 meta/lib/oeqa/selftest/cases/runtime_test.py   | 18 ++++++------------
 .../qemu/qemu-system-native_4.1.0.bb           |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb       |  5 ++++-
 meta/recipes-gnome/gtk+/gtk+3.inc              |  2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb    |  2 ++
 .../libepoxy/libepoxy_1.5.4.bb                 |  2 --
 .../recipes-graphics/libsdl2/libsdl2_2.0.10.bb |  4 ++--
 .../virglrenderer/virglrenderer_0.8.1.bb       |  2 --
 9 files changed, 21 insertions(+), 22 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl when building for -native: we do not need it, and it would cause build failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes as opengl feature is now correctly set for those variants.

---
 meta/conf/bitbake.conf                                     | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc                          | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb                | 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb           | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)
meta/conf/bitbake.conf +2 -2
index 2da7c5849a9..15485ae88b2 100644
@@ -825,8 +825,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
meta/recipes-gnome/gtk+/gtk+3.inc +2 -0
index e1f1e0db314..e525a471efa 100644
@@ -47,6 +47,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
 PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
meta/recipes-graphics/cairo/cairo_1.16.0.bb +2 -0
index e3de3f6164a..dcca6c1a311 100644
@@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +0 -2
index af9867407ed..1aa850d0043 100644
@@ -19,8 +19,6 @@ UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
 inherit meson pkgconfig features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
 
 PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
 PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no -Dx11=false, virtual/libx11 virtual/libgl"
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +0 -2
index 133618844a9..deaac5e965c 100644
@@ -22,5 +22,3 @@ inherit meson pkgconfig features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 libsdl2: enable opengl option for native/nativesdk, subject to 'opengl' in DISTRO_FEATURES

In reply to Alexander Kanavin

This allows virgl support in qemu with the SDL frontend

---
 meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb +2 -2
index 413f53476ae..06f9d6ede34 100644
@@ -44,8 +44,8 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
 # and BSP layers to pick either (desktop) opengl, gles2, or no GL
 PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 
-PACKAGECONFIG_class-native = "x11"
-PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-native = "x11 ${PACKAGECONFIG_GL}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${PACKAGECONFIG_GL}"
 PACKAGECONFIG ??= " \
     ${PACKAGECONFIG_GL} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/3 qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE

In reply to Alexander Kanavin

Note that to actually use accelerated GL passthrough, there are two options

1) a suitable frontend need to be also enabled - gtk+ and SDL both seem to work well. Previously I struggled to make SDL work, but now it seems fine.

2) it is also possible to render off-screen with -display egl-headless option, and see the output with a VNC viewer (for which, qemu needs to be started with a VNC server):

$ runqemu kvm egl-headless publicvnc
---
 meta/lib/oeqa/selftest/cases/runtime_test.py   | 18 ++++++------------
 .../qemu/qemu-system-native_4.1.0.bb           |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb       |  5 ++++-
 3 files changed, 13 insertions(+), 14 deletions(-)
meta/lib/oeqa/selftest/cases/runtime_test.py +6 -12
index 60cb2e01a60..9b87c04e246 100644
@@ -186,18 +186,14 @@ class TestImage(OESelftestTestCase):
             self.skipTest('virgl isn\'t working with Opensuse 15.0')
 
         qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
-        sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
+        qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
         features = 'INHERIT += "testimage"\n'
         if 'gtk+' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"\n'
         if 'sdl' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
-        if 'virglrenderer' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
-        if 'glx' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
-        if 'opengl' not in sdl_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
+        if 'opengl' not in qemu_distrofeatures:
+            features += 'DISTRO_FEATURES_append = " opengl"\n'
         features += 'TEST_SUITES = "ping ssh virgl"\n'
         features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
         features += 'IMAGE_INSTALL_append = " kmscube"\n'
@@ -229,12 +225,10 @@ class TestImage(OESelftestTestCase):
             dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True)
         except subprocess.CalledProcessError as e:
             self.skipTest("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.")
-        qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+        qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
         features = 'INHERIT += "testimage"\n'
-        if 'virglrenderer' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
-        if 'glx' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+        if 'opengl' not in qemu_distrofeatures:
+            features += 'DISTRO_FEATURES_append = " opengl"\n'
         features += 'TEST_SUITES = "ping ssh virgl"\n'
         features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
         features += 'IMAGE_INSTALL_append = " kmscube"\n'
meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb +3 -1
index d83ee59375c..7394385d30b 100644
@@ -9,7 +9,9 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native"
 
 EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
 
-PACKAGECONFIG ??= "fdt alsa kvm"
+PACKAGECONFIG ??= "fdt alsa kvm \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' ,d)} \
+"
 
 # Handle distros such as CentOS 5 32-bit that do not have kvm support
 PACKAGECONFIG_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
meta/recipes-devtools/qemu/qemu_4.1.0.bb +4 -1
index f0c1daabe15..a4018cc4485 100644
@@ -21,5 +21,8 @@ do_install_append_class-nativesdk() {
 PACKAGECONFIG ??= " \
     fdt sdl kvm \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' ,d)} \
+"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' ,d)} \
 "
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
Signature · 1 line
2.17.1
#4 lore raw
In reply to Alexander Kanavin

I forgot to mention that this is all entirely opt-in (via non-default options to 'runqemu'). By default qemu behaves exactly as before, and does not use virgl.

Alex

Quoted 45 lines · Alexander Kanavin

virgl is a virtualized accelerated 3D graphics support for the qemu guests. This patchset enables virgl in qemu, when 'opengl' is in DISTRO_FEATURES.

This adds a few native dependencies to qemu-system-native (particularly, libdrm, virglrenderer and a special minimal configuration of mesa-native). I tested the impact on build times: it is about 30 seconds on a 16 core machine. 'bitbake core-image-minimal' goes from 25m26s to 25m57s.

The following changes since commit
ca3993cc4b13d4e661228cee6fb9448adfd0a4ba:

bitbake: tests/fetch: Allow wget upgrade tests to run against a local
server (2020-01-22 15:56:39 +0000)

are available in the Git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/qemu-split-virgl-gtk

http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/qemu-split-virgl-gtk

Alexander Kanavin (3):
bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk
from target
libsdl2: enable opengl option for native/nativesdk, subject to
'opengl' in DISTRO_FEATURES
qemu: enable virglrenderer and glx options subject to 'opengl'
DISTRO_FEATURE

 meta/conf/bitbake.conf                         |  4 ++--
 meta/lib/oeqa/selftest/cases/runtime_test.py   | 18 ++++++------------
 .../qemu/qemu-system-native_4.1.0.bb           |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb       |  5 ++++-
 meta/recipes-gnome/gtk+/gtk+3.inc              |  2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb    |  2 ++
 .../libepoxy/libepoxy_1.5.4.bb                 |  2 --
 .../recipes-graphics/libsdl2/libsdl2_2.0.10.bb |  4 ++--
 .../virglrenderer/virglrenderer_0.8.1.bb       |  2 --
 9 files changed, 21 insertions(+), 22 deletions(-)

--
2.17.1