aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-11-11 12:10:08 +0100
committerAlexey Kardashevskiy <aik@ozlabs.ru>2016-11-14 19:13:31 +1100
commit38bf852e73ce6f0ac801dfe8ef1545c4cd0b5ddb (patch)
treea3a112c4c8f578f637643e0bd395e0d4240fb9d0
parentb294381e48ed9c3300e7aea4c4ba7f17729ffd9f (diff)
downloadSLOF-38bf852e73ce6f0ac801dfe8ef1545c4cd0b5ddb.zip
SLOF-38bf852e73ce6f0ac801dfe8ef1545c4cd0b5ddb.tar.gz
SLOF-38bf852e73ce6f0ac801dfe8ef1545c4cd0b5ddb.tar.bz2
Do not try to use virtio-gpu in VGA mode
virtio-gpu and virtio-vga share the same PCI ID (but have a different PCI class). Since virtio-gpu does not have the VGA register interface anymore, we should never try to use these registers in SLOF, i.e. we must not include qemu-vga.fs in this case. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1375166 Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-rw-r--r--board-qemu/slof/pci-device_1af4_1050.fs12
1 files changed, 10 insertions, 2 deletions
diff --git a/board-qemu/slof/pci-device_1af4_1050.fs b/board-qemu/slof/pci-device_1af4_1050.fs
index 516056a..0e7f639 100644
--- a/board-qemu/slof/pci-device_1af4_1050.fs
+++ b/board-qemu/slof/pci-device_1af4_1050.fs
@@ -10,6 +10,14 @@
\ * IBM Corporation - initial implementation
\ ****************************************************************************/
-s" virtio [ vga ]" type cr
+\ Note: The PCI ID 1af4:1050 is used for both, virtio-vga and virtio-gpu
+\ devices. Only the first one provides a VGA interface that we currently
+\ support in SLOF.
-s" qemu-vga.fs" included
+my-space pci-class@ 30000 = IF
+ s" virtio [ vga ]" type cr
+ s" qemu-vga.fs" included
+ELSE
+ s" virtio [ gpu ]" type cr
+ my-space pci-device-generic-setup
+THEN