Commit 785a602e authored Jun 13, 2019 by Peter Maydell

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>

parents 41dbe0df 0a719662

hw/core/machine.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -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[] = {};

hw/display/bochs-display.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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(),
		};

hw/display/vga-pci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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(),
		};

include/hw/display/edid.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ void qemu_edid_region_io(MemoryRegion region, Object owner,

		#define DEFINE_EDID_PROPERTIES(_state, _edid_info) \
		DEFINE_PROP_UINT32("xres", _state, _edid_info.prefx, 0), \
		DEFINE_PROP_UINT32("yres", _state, _edid_info.prefy, 0)
		DEFINE_PROP_UINT32("yres", _state, _edid_info.prefy, 0), \
		DEFINE_PROP_UINT32("xmax", _state, _edid_info.maxx, 0), \
		DEFINE_PROP_UINT32("ymax", _state, _edid_info.maxy, 0)

		#endif /* EDID_H */

include/hw/virtio/virtio-gpu.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ typedef struct VirtIOGPUBaseClass {
		#define VIRTIO_GPU_BASE_PROPERTIES(_state, _conf) \
		DEFINE_PROP_UINT32("max_outputs", _state, _conf.max_outputs, 1), \
		DEFINE_PROP_BIT("edid", _state, _conf.flags, \
		VIRTIO_GPU_FLAG_EDID_ENABLED, false), \
		VIRTIO_GPU_FLAG_EDID_ENABLED, true), \
		DEFINE_PROP_UINT32("xres", _state, _conf.xres, 1024), \
		DEFINE_PROP_UINT32("yres", _state, _conf.yres, 768)