summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-10-27 22:18:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-30 18:55:54 +0100
commitd6d5fe44510d2087b735758ac85e804533a1778c (patch)
treed2befaa3e5a8c900c976e9e0898eeb36e36a3521
parentc884878f6c833b18a3a95b193f5de68df5bcea48 (diff)
downloadopenembedded-core-contrib-d6d5fe44510d2087b735758ac85e804533a1778c.tar.gz
runqemu: unbreak non-gl displays
Correct two issues: 1. Looking for dri.pc is only needed when gl is enabled. 2. virtio-vga-gl works only when gl is enabled via -display, otherwise virtio-vga needs to be selected. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rwxr-xr-xscripts/runqemu11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 54f2336ba9..1143509975 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1349,9 +1349,14 @@ class BaseConfig(object):
raise RunQemuError('Option gl/gl-es needs gtk or sdl option.')
if self.sdl == True or self.gtk == True or self.egl_headless == True:
- self.set_dri_path()
- self.qemu_opt += ' -device virtio-vga-gl -display '
+ if self.gl or self.gl_es or self.egl_headless:
+ self.qemu_opt += ' -device virtio-vga-gl '
+ else:
+ self.qemu_opt += ' -device virtio-vga '
+
+ self.qemu_opt += '-display '
if self.egl_headless == True:
+ self.set_dri_path()
self.qemu_opt += 'egl-headless,'
else:
if self.sdl == True:
@@ -1360,8 +1365,10 @@ class BaseConfig(object):
self.qemu_opt += 'gtk,'
if self.gl == True:
+ self.set_dri_path()
self.qemu_opt += 'gl=on,'
elif self.gl_es == True:
+ self.set_dri_path()
self.qemu_opt += 'gl=es,'
self.qemu_opt += 'show-cursor=on'