From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCodb-0007q0-Gh for qemu-devel@nongnu.org; Tue, 14 Jun 2016 09:44:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCodZ-0000Bo-Ln for qemu-devel@nongnu.org; Tue, 14 Jun 2016 09:44:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCodZ-0000Be-Fl for qemu-devel@nongnu.org; Tue, 14 Jun 2016 09:44:13 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 10B4A201FB for ; Tue, 14 Jun 2016 13:44:13 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Tue, 14 Jun 2016 15:44:07 +0200 Message-Id: <1465911849-30423-2-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1465911849-30423-1-git-send-email-marcandre.lureau@redhat.com> References: <1465911849-30423-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/3] virgl: count the calls to gl_block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau 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=C3=A9 Lureau --- 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 b= lock) { VirtIOGPU *g =3D opaque; =20 - g->renderer_blocked =3D block; - if (!block) { + if (block) { + g->renderer_blocked++; + } else { + g->renderer_blocked--; + } + assert(g->renderer_blocked >=3D 0); + + if (g->renderer_blocked =3D=3D 0) { virtio_gpu_process_cmdq(g); } } diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gp= u.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 { =20 bool use_virgl_renderer; bool renderer_inited; - bool renderer_blocked; + int renderer_blocked; QEMUTimer *fence_poll; QEMUTimer *print_stats; =20 --=20 2.7.4