From 7bbd93f8dcfd91a26144963d3fe9389db82e9cb1 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Thu, 16 Sep 2021 18:20:06 -0400 Subject: machine/qemuarm*: use virtio graphics Switch to using virtio graphics for the Arm QEMU machines. You will noticed the difference in the dmesg by seeing: [ 2.693337] [drm] pci: virtio-gpu-pci detected at 0000:00:10.0 (From OE-Core rev: 961158653170f53de58672e474c41f1533f469fc) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm.conf | 2 +- meta/conf/machine/qemuarm64.conf | 2 +- meta/conf/machine/qemuarmv5.conf | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 93d855b6e1..d71a793edf 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -20,7 +20,7 @@ QB_SMP = "-smp 4" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_GRAPHICS = "-device VGA,edid=on" +QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index ea7fae2722..3b08dedddc 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -19,7 +19,7 @@ QB_CPU = "-cpu cortex-a57" QB_SMP = "-smp 4" QB_CPU_KVM = "-cpu host -machine gic-version=3" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_GRAPHICS = "-device VGA,edid=on" +QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 6c99a52965..252d6286d8 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -13,7 +13,8 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" -QB_OPT_APPEND = "-usb -device usb-tablet" +QB_GRAPHICS = "-device virtio-gpu-pci" +QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" PREFERRED_VERSION_linux-yocto ??= "5.13%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" -- cgit v1.2.3-54-g00ecf