]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190318-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Mar 2019 15:00:15 +0000 (15:00 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Mar 2019 15:00:15 +0000 (15:00 +0000)
commite5b670c9f84a394a127f73d77400e52146f219ac
tree3dac2fee9489aa60eb2425f39ff18d2cea867ae3
parent3c18a08cf387d44a351b9877497b5e0ea27c5140
parentdc84ed5b57cc6d06955e2f49ade9dca277e92cd4
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190318-pull-request' into staging

vga: fixes for 4.0 (ati trace, virtio-gpu reset).

# gpg: Signature made Mon 18 Mar 2019 13:25:54 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-20190318-pull-request:
  virtio-gpu: clear command and fence queues on reset
  virtio-gpu: delay virglrenderer reset when blocked.
  ati-vga: fix tracing

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>