From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJK8N-0004JH-K4 for qemu-devel@nongnu.org; Wed, 13 Jan 2016 07:02:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJK8I-00058h-Rx for qemu-devel@nongnu.org; Wed, 13 Jan 2016 07:02:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60665) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJK8I-00058N-Mh for qemu-devel@nongnu.org; Wed, 13 Jan 2016 07:02:34 -0500 From: Gerd Hoffmann Date: Wed, 13 Jan 2016 13:02:27 +0100 Message-Id: <1452686548-6291-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1452686548-6291-1-git-send-email-kraxel@redhat.com> References: <1452686548-6291-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] virtio-gpu: add support to enable/disable command processing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , "Michael S. Tsirkin" So we can stop rendering for a while in case we have to. Signed-off-by: Gerd Hoffmann --- hw/display/virtio-gpu-3d.c | 3 ++- hw/display/virtio-gpu.c | 5 ++++- include/hw/virtio/virtio-gpu.h | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index d2af327..65926b1 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -553,7 +553,8 @@ static void virtio_gpu_fence_poll(void *opaque) VirtIOGPU *g = opaque; virgl_renderer_poll(); - if (g->inflight) { + virtio_cpu_process_cmdq(g); + if (!QTAILQ_EMPTY(&g->cmdq) || !QTAILQ_EMPTY(&g->fenceq)) { timer_mod(g->fence_poll, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 10); } } diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 4433c12..9087e63 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -754,7 +754,7 @@ static void virtio_gpu_handle_cursor_cb(VirtIODevice *vdev, VirtQueue *vq) qemu_bh_schedule(g->cursor_bh); } -static void virtio_cpu_process_cmdq(VirtIOGPU *g) +void virtio_cpu_process_cmdq(VirtIOGPU *g) { struct virtio_gpu_ctrl_command *cmd; @@ -764,6 +764,9 @@ static void virtio_cpu_process_cmdq(VirtIOGPU *g) /* process command */ VIRGL(g, virtio_gpu_virgl_process_cmd, virtio_gpu_simple_process_cmd, g, cmd); + if (cmd->waiting) { + break; + } QTAILQ_REMOVE(&g->cmdq, cmd, next); if (virtio_gpu_stats_enabled(g->conf)) { g->stats.requests++; diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index f7e7a52..fdf0091 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -76,6 +76,7 @@ struct virtio_gpu_ctrl_command { VirtQueue *vq; struct virtio_gpu_ctrl_hdr cmd_hdr; uint32_t error; + bool waiting; bool finished; QTAILQ_ENTRY(virtio_gpu_ctrl_command) next; }; @@ -152,6 +153,7 @@ int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab, struct virtio_gpu_ctrl_command *cmd, struct iovec **iov); void virtio_gpu_cleanup_mapping_iov(struct iovec *iov, uint32_t count); +void virtio_cpu_process_cmdq(VirtIOGPU *g); /* virtio-gpu-3d.c */ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, -- 1.8.3.1