diff options
| author | Peter Maydell | 2019-06-13 14:25:25 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-06-13 14:25:25 +0200 |
| commit | 785a602eae7ad97076b9794ebaba072ad4a9f74f (patch) | |
| tree | 174522c44687bd9a5a56b0d4202281aededcbaca /hw | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190612' into staging (diff) | |
| parent | edid: flip the default to enabled (diff) | |
| download | qemu-785a602eae7ad97076b9794ebaba072ad4a9f74f.tar.gz qemu-785a602eae7ad97076b9794ebaba072ad4a9f74f.tar.xz qemu-785a602eae7ad97076b9794ebaba072ad4a9f74f.zip | |
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')
| -rw-r--r-- | hw/core/machine.c | 8 | ||||
| -rw-r--r-- | hw/display/bochs-display.c | 2 | ||||
| -rw-r--r-- | hw/display/vga-pci.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index f1a0f45f9c..84ebb8d247 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -24,7 +24,13 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" -GlobalProperty hw_compat_4_0_1[] = {}; +GlobalProperty hw_compat_4_0_1[] = { + { "VGA", "edid", "false" }, + { "secondary-vga", "edid", "false" }, + { "bochs-display", "edid", "false" }, + { "virtio-vga", "edid", "false" }, + { "virtio-gpu-pci", "edid", "false" }, +}; const size_t hw_compat_4_0_1_len = G_N_ELEMENTS(hw_compat_4_0_1); GlobalProperty hw_compat_4_0[] = {}; diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 0a2a3e27c4..582133dd71 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -338,7 +338,7 @@ static void bochs_display_exit(PCIDevice *dev) static Property bochs_display_properties[] = { DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * MiB), - DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, false), + DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, true), DEFINE_EDID_PROPERTIES(BochsDisplayState, edid_info), DEFINE_PROP_END_OF_LIST(), }; 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(), }; |