| Message ID | 1478778717-3312-1-git-send-email-thuth@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
On 10.11.2016 12:51, Thomas Huth wrote: > virtio-gpu and virtio-vga share the same PCI ID (but have a > different PCI class). But 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> > --- > board-qemu/slof/pci-device_1af4_1050.fs | 11 +++++++++-- > 1 file changed, 9 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..9448006 100644 > --- a/board-qemu/slof/pci-device_1af4_1050.fs > +++ b/board-qemu/slof/pci-device_1af4_1050.fs > @@ -10,6 +10,13 @@ > \ * 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 > +THEN Please ignore this version of the patch - I still need to call pci-device-generic-setup for virtio-gpu devices which is not done here. I'll send a v2... Thomas
diff --git a/board-qemu/slof/pci-device_1af4_1050.fs b/board-qemu/slof/pci-device_1af4_1050.fs index 516056a..9448006 100644 --- a/board-qemu/slof/pci-device_1af4_1050.fs +++ b/board-qemu/slof/pci-device_1af4_1050.fs @@ -10,6 +10,13 @@ \ * 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 +THEN
virtio-gpu and virtio-vga share the same PCI ID (but have a different PCI class). But 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> --- board-qemu/slof/pci-device_1af4_1050.fs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)