summary refs log tree commit diff stats
path: root/hw/display/trace-events
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-02-25 12:49:07 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-02-25 12:49:07 +0000
commit59a568b57848b10e8a44518a889323f12ccdd8f4 (patch)
treeb686b058f54ee4bebec1b13e8c90f4d9f1768595 /hw/display/trace-events
parent8a4c08b16187c238f05aa783c8deedb8099e940d (diff)
parent1ed2cb32dc9e8f74c82bdc567edad717b0f34fa5 (diff)
downloadfocaccia-qemu-59a568b57848b10e8a44518a889323f12ccdd8f4.tar.gz
focaccia-qemu-59a568b57848b10e8a44518a889323f12ccdd8f4.zip
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190222-pull-request' into staging
vga: bugfixes and edid support for virtio-vga

# gpg: Signature made Fri 22 Feb 2019 08:24:25 GMT
# 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-20190222-pull-request:
  display/virtio: add edid support.
  virtio-gpu: remove useless 'waiting' field
  virtio-gpu: block both 2d and 3d rendering
  virtio-gpu: remove unused config_size
  virtio-gpu: remove unused qdev

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/trace-events')
-rw-r--r--hw/display/trace-events1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/display/trace-events b/hw/display/trace-events
index 387c6b8931..37d3264bb2 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -35,6 +35,7 @@ vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp) "%dx%d @ %d bpp"
 # hw/display/virtio-gpu.c
 virtio_gpu_features(bool virgl) "virgl %d"
 virtio_gpu_cmd_get_display_info(void) ""
+virtio_gpu_cmd_get_edid(uint32_t scanout) "scanout %d"
 virtio_gpu_cmd_set_scanout(uint32_t id, uint32_t res, uint32_t w, uint32_t h, uint32_t x, uint32_t y) "id %d, res 0x%x, w %d, h %d, x %d, y %d"
 virtio_gpu_cmd_res_create_2d(uint32_t res, uint32_t fmt, uint32_t w, uint32_t h) "res 0x%x, fmt 0x%x, w %d, h %d"
 virtio_gpu_cmd_res_create_3d(uint32_t res, uint32_t fmt, uint32_t w, uint32_t h, uint32_t d) "res 0x%x, fmt 0x%x, w %d, h %d, d %d"