qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PULL 7/9] virgl: count the calls to gl_block
Date: Wed,  6 Jul 2016 12:04:40 +0200	[thread overview]
Message-ID: <1467799482-26420-8-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1467799482-26420-1-git-send-email-kraxel@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

In virgl_cmd_resource_flush(), when several consoles are updated, it
needs to keep blocking until all spice gl draws are done. This fixes an
assert() in spice when using multiple monitors with virgl.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 1465911849-30423-2-git-send-email-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/virtio-gpu.c        | 10 ++++++++--
 include/hw/virtio/virtio-gpu.h |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 136c095..f8b0274 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);
     }
 }
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 89f4879..3dff0c9 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -107,7 +107,7 @@ typedef struct VirtIOGPU {
 
     bool use_virgl_renderer;
     bool renderer_inited;
-    bool renderer_blocked;
+    int renderer_blocked;
     QEMUTimer *fence_poll;
     QEMUTimer *print_stats;
 
-- 
1.8.3.1

  parent reply	other threads:[~2016-07-06 10:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-06 10:04 [Qemu-devel] [PULL 0/9] spice and qxl bugfixes Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 1/9] qxl: use uint64_t for vram size Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 2/9] qxl: handle no updates in interface_update_area_complete Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 3/9] qxl: factor out qxl_get_check_slot_offset Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 4/9] qxl: store memory region and offset instead of pointer for guest slots Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 5/9] qxl: fix surface migration Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 6/9] spice: avoid .set_mm_time on >= 0.12.6 Gerd Hoffmann
2016-07-06 10:04 ` Gerd Hoffmann [this message]
2016-07-06 10:04 ` [Qemu-devel] [PULL 8/9] spice: use the right head for multi-monitor Gerd Hoffmann
2016-07-06 10:04 ` [Qemu-devel] [PULL 9/9] virgl: pass whole GL scanout dimensions Gerd Hoffmann
2016-07-06 13:07 ` [Qemu-devel] [PULL 0/9] spice and qxl bugfixes Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467799482-26420-8-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).