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 /include | |
| parent | 41dbe0df9a26e3e08d01fb025ea7429ff1f3c779 (diff) | |
| parent | 0a71966253c8b07586ebd6bee094a818e1e163b8 (diff) | |
| download | 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 'include')
| -rw-r--r-- | include/hw/display/edid.h | 4 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-gpu.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index bacf170889..7948bd2c40 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -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 */ diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 8ecac1987a..6dd57f2025 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -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) |