diff options
| author | Peter Maydell | 2017-09-14 13:58:13 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-14 13:58:13 +0200 |
| commit | bcf9e2c0a5f8de395842e034ca15be13d1fc5f90 (patch) | |
| tree | 0516090ffe4ea4fb5d33678cffc9ee18d31855f1 /hw/display/virtio-gpu.c | |
| parent | tcg/tci: do not use ldst label (never implemented) (diff) | |
| parent | virtio-gpu: don't clear QemuUIInfo information on reset (diff) | |
| download | qemu-bcf9e2c0a5f8de395842e034ca15be13d1fc5f90.tar.gz qemu-bcf9e2c0a5f8de395842e034ca15be13d1fc5f90.tar.xz qemu-bcf9e2c0a5f8de395842e034ca15be13d1fc5f90.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170913-pull-request' into staging
vga: bugfixes.
qxl: chunked cursor support.
# gpg: Signature made Wed 13 Sep 2017 08:41:08 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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-20170913-pull-request:
virtio-gpu: don't clear QemuUIInfo information on reset
vga/migration: Update memory map in post_load
qxl: add support for chunked cursors.
qxl: drop mono cursor support
vga: stop passing pointers to vga_draw_line* functions
vga: fix display update region calculation (split screen)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-gpu.c')
| -rw-r--r-- | hw/display/virtio-gpu.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index f0761cf18b..622ee300f9 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1195,17 +1195,6 @@ static void virtio_gpu_reset(VirtIODevice *vdev) virtio_gpu_resource_destroy(g, res); } for (i = 0; i < g->conf.max_outputs; i++) { -#if 0 - g->req_state[i].x = 0; - g->req_state[i].y = 0; - if (i == 0) { - g->req_state[0].width = 1024; - g->req_state[0].height = 768; - } else { - g->req_state[i].width = 0; - g->req_state[i].height = 0; - } -#endif g->scanout[i].resource_id = 0; g->scanout[i].width = 0; g->scanout[i].height = 0; @@ -1213,7 +1202,6 @@ static void virtio_gpu_reset(VirtIODevice *vdev) g->scanout[i].y = 0; g->scanout[i].ds = NULL; } - g->enabled_output_bitmask = 1; #ifdef CONFIG_VIRGL if (g->use_virgl_renderer) { |