diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-29 12:03:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-29 12:03:06 +0100 |
| commit | 5663ac2aa0eafb40411ac4dff85e6ab529c4d199 (patch) | |
| tree | 233ab02490625bf4ab4cb59a46f2cb620c72c952 /include/hw | |
| parent | 213057383c9f73a17cfe635b204d88e11f918df1 (diff) | |
| parent | 97a0530bb71fb96468f218b622cd840e2c667bf6 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200929-pull-request' into staging
virtio-vga: reset fix, bigendian fix.
virtio-vga+spice: set monitor dimension via edid.
# gpg: Signature made Tue 29 Sep 2020 10:57:01 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-20200929-pull-request:
ppc/pseries: enable big-endian-framebuffer quirk for bochs-display and virtio-vga
virtio-vga: implement big-endian-framebuffer property
virtio-gpu: set physical dimensions for EDID
spice: get monitors physical dimension
spice: remove the single monitor config logic
ui: add getter for UIInfo
edid: use physical dimensions if available
edid: fix physical display size computation
virtio-gpu-3d: fix abnormal display after a warm reboot
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/display/edid.h | 5 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-gpu.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index 5b1de57f24..1f8fc9b375 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -5,7 +5,8 @@ typedef struct qemu_edid_info { const char *vendor; /* http://www.uefi.org/pnp_id_list */ const char *name; const char *serial; - uint32_t dpi; + uint16_t width_mm; + uint16_t height_mm; uint32_t prefx; uint32_t prefy; uint32_t maxx; @@ -18,6 +19,8 @@ size_t qemu_edid_size(uint8_t *edid); void qemu_edid_region_io(MemoryRegion *region, Object *owner, uint8_t *edid, size_t size); +uint32_t qemu_edid_dpi_to_mm(uint32_t dpi, uint32_t res); + #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), \ diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 455e0a7433..1aed7275c8 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -62,6 +62,7 @@ struct virtio_gpu_scanout { }; struct virtio_gpu_requested_state { + uint16_t width_mm, height_mm; uint32_t width, height; int x, y; }; |