diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-13 13:25:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-13 13:25:25 +0100 |
| commit | 785a602eae7ad97076b9794ebaba072ad4a9f74f (patch) | |
| tree | 174522c44687bd9a5a56b0d4202281aededcbaca /hw/display/vga-pci.c | |
| parent | 41dbe0df9a26e3e08d01fb025ea7429ff1f3c779 (diff) | |
| parent | 0a71966253c8b07586ebd6bee094a818e1e163b8 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190613-pull-request' into staging
edid: add xmax + ymax properties, enable by default.
# gpg: Signature made Thu 13 Jun 2019 08:38:18 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190613-pull-request:
edid: flip the default to enabled
edid: add xmax + ymax properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/vga-pci.c')
| -rw-r--r-- | hw/display/vga-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index c66d9ec7ee..dedac5d128 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -340,7 +340,7 @@ static Property vga_pci_properties[] = { DEFINE_PROP_BIT("qemu-extended-regs", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true), DEFINE_PROP_BIT("edid", - PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, false), + PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true), DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info), DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, false), DEFINE_PROP_END_OF_LIST(), @@ -351,7 +351,7 @@ static Property secondary_pci_properties[] = { DEFINE_PROP_BIT("qemu-extended-regs", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true), DEFINE_PROP_BIT("edid", - PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, false), + PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true), DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info), DEFINE_PROP_END_OF_LIST(), }; |