diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 11:33:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 11:33:16 +0100 |
| commit | cc28dce2eccdcfc2660b8bf680eaa340ef2067d5 (patch) | |
| tree | 53b756fec754323b97115bca4401d57dfca23bcb /include | |
| parent | e7f5f0b6e6f2fb592ab66145b8bc35a0e4a4e198 (diff) | |
| parent | 36ffc122dcd69ab66db4afab3a13cfca46bfc323 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180927-pull-request' into staging
vga: add edid support, qxl bugfixes.
# gpg: Signature made Thu 27 Sep 2018 08:12:32 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20180927-pull-request:
qxl: support mono cursors with inverted colors
qxl: use guest_monitor_config for local renderer.
display/stdvga: add edid support.
display/edid: add DEFINE_EDID_PROPERTIES
display/edid: add region helper.
display/edid: add qemu_edid_size()
display/edid: add edid generator to qemu.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/display/edid.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h new file mode 100644 index 0000000000..bd51d26916 --- /dev/null +++ b/include/hw/display/edid.h @@ -0,0 +1,27 @@ +#ifndef EDID_H +#define EDID_H + +#include "hw/hw.h" + +typedef struct qemu_edid_info { + const char *vendor; + const char *name; + const char *serial; + uint32_t dpi; + uint32_t prefx; + uint32_t prefy; + uint32_t maxx; + uint32_t maxy; +} qemu_edid_info; + +void qemu_edid_generate(uint8_t *edid, size_t size, + qemu_edid_info *info); +size_t qemu_edid_size(uint8_t *edid); +void qemu_edid_region_io(MemoryRegion *region, Object *owner, + uint8_t *edid, size_t size); + +#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) + +#endif /* EDID_H */ |