| Message ID | 1478862608-7660-1-git-send-email-thuth@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
On 11/11/16 22:10, Thomas Huth wrote: > 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. > Thanks, applied. > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1375166 > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > v2: > - Set up the gpu devices with pci-device-generic-setup > > board-qemu/slof/pci-device_1af4_1050.fs | 12 ++++++++++-- > 1 file 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 >
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
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> --- v2: - Set up the gpu devices with pci-device-generic-setup board-qemu/slof/pci-device_1af4_1050.fs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)