diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-06 12:49:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-06 12:49:51 +0100 |
| commit | 0c56c6ab68902281094c7aac6305e2321c34c187 (patch) | |
| tree | cf570f12b1c76ee62413ebca618f850774322142 /hw/display/virtio-gpu.c | |
| parent | 975b1c3ac6ae57b3e1356b0156c68f63a8a349dc (diff) | |
| parent | 9d8256ebc0ef88fb1f35d0405893962d20cc10ad (diff) | |
| download | focaccia-qemu-0c56c6ab68902281094c7aac6305e2321c34c187.tar.gz focaccia-qemu-0c56c6ab68902281094c7aac6305e2321c34c187.zip | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20160706-1' into staging
spice and qxl bugfixes. # gpg: Signature made Wed 06 Jul 2016 10:44:10 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/spice/tags/pull-spice-20160706-1: virgl: pass whole GL scanout dimensions spice: use the right head for multi-monitor virgl: count the calls to gl_block spice: avoid .set_mm_time on >= 0.12.6 qxl: fix surface migration qxl: store memory region and offset instead of pointer for guest slots qxl: factor out qxl_get_check_slot_offset qxl: handle no updates in interface_update_area_complete qxl: use uint64_t for vram size 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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 136c095b7d..f8b0274752 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -934,8 +934,14 @@ static void virtio_gpu_gl_block(void *opaque, bool block) { VirtIOGPU *g = opaque; - g->renderer_blocked = block; - if (!block) { + if (block) { + g->renderer_blocked++; + } else { + g->renderer_blocked--; + } + assert(g->renderer_blocked >= 0); + + if (g->renderer_blocked == 0) { virtio_gpu_process_cmdq(g); } } |