Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210615-pull-request' into...
commite3897b75fd2ac8c4bfda95d60309cb6414da8000
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 16 Jun 2021 13:32:43 +0000 (16 14:32 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 16 Jun 2021 13:32:43 +0000 (16 14:32 +0100)
treece7a8e70732b9d71563d363510b27b4eb51bae7e
parent1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a
parent4fa7b4cc500e1fbd8c11e65548b7713db81e75ff
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210615-pull-request' into staging

vga: fixes for stdvga, vhost-user-gpu and virtio-gpu.

# gpg: Signature made Tue 15 Jun 2021 18:40:11 BST
# gpg:                using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# 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-20210615-pull-request:
  virtio-gpu: move scanout_id sanity check
  vhost-user-gpu: reorder free calls.
  vga: Allow writing VBE_DISPI_ID5 to ID register

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