diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-16 14:32:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-16 14:32:43 +0100 |
| commit | e3897b75fd2ac8c4bfda95d60309cb6414da8000 (patch) | |
| tree | ce7a8e70732b9d71563d363510b27b4eb51bae7e /hw/display/vga.c | |
| parent | 1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a (diff) | |
| parent | 4fa7b4cc500e1fbd8c11e65548b7713db81e75ff (diff) | |
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>
Diffstat (limited to 'hw/display/vga.c')
| -rw-r--r-- | hw/display/vga.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index 28a90e30d0..9d1f66af40 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -752,7 +752,8 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) val == VBE_DISPI_ID1 || val == VBE_DISPI_ID2 || val == VBE_DISPI_ID3 || - val == VBE_DISPI_ID4) { + val == VBE_DISPI_ID4 || + val == VBE_DISPI_ID5) { s->vbe_regs[s->vbe_index] = val; } break; |