Hi
On Wed, Jan 13, 2016 at 1:02 PM, Gerd Hoffmann wrote:
> Wire up gl_block callback, so ui code can request to stop
> virtio-gpu rendering.
>
> Signed-off-by: Gerd Hoffmann
> ---
> hw/display/virtio-gpu-3d.c | 5 +
> hw/display/virtio-gpu.c| 8
> hw/display/virtio-vga.c| 10 ++
> include/hw/virtio/virtio-gpu.h | 1 +
> 4 files changed, 24 insertions(+)
>
> diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
> index 65926b1..321a959 100644
> --- a/hw/display/virtio-gpu-3d.c
> +++ b/hw/display/virtio-gpu-3d.c
> @@ -382,6 +382,11 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
> {
> VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr);
>
> +cmd->waiting = g->renderer_blocked;
> +if (cmd->waiting) {
> +return;
> +}
> +
> virgl_renderer_force_ctx_0();
> switch (cmd->cmd_hdr.type) {
> case VIRTIO_GPU_CMD_CTX_CREATE:
> diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
> index 9087e63..09936c9 100644
> --- a/hw/display/virtio-gpu.c
> +++ b/hw/display/virtio-gpu.c
> @@ -893,11 +893,19 @@ static int virtio_gpu_ui_info(void *opaque, uint32_t
> idx, QemuUIInfo *info)
> return 0;
> }
>
> +static void virtio_gpu_gl_block(void *opaque, bool block)
> +{
> +VirtIOGPU *g = opaque;
> +
> +g->renderer_blocked = block;
> +}
Why not add here?:
+if (!block) {
+virtio_cpu_process_cmdq(g);
+}
> +
> const GraphicHwOps virtio_gpu_ops = {
> .invalidate = virtio_gpu_invalidate_display,
> .gfx_update = virtio_gpu_update_display,
> .text_update = virtio_gpu_text_update,
> .ui_info = virtio_gpu_ui_info,
> +.gl_block = virtio_gpu_gl_block,
> };
>
> static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
> diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
> index f7e539f..255d419 100644
> --- a/hw/display/virtio-vga.c
> +++ b/hw/display/virtio-vga.c
> @@ -65,11 +65,21 @@ static int virtio_vga_ui_info(void *opaque, uint32_t idx,
> QemuUIInfo *info)
> return -1;
> }
>
> +static void virtio_vga_gl_block(void *opaque, bool block)
> +{
> +VirtIOVGA *vvga = opaque;
> +
> +if (virtio_gpu_ops.gl_block) {
> +virtio_gpu_ops.gl_block(&vvga->vdev, block);
> +}
> +}
> +
> static const GraphicHwOps virtio_vga_ops = {
> .invalidate = virtio_vga_invalidate_display,
> .gfx_update = virtio_vga_update_display,
> .text_update = virtio_vga_text_update,
> .ui_info = virtio_vga_ui_info,
> +.gl_block = virtio_vga_gl_block,
> };
>
> /* VGA device wrapper around PCI device around virtio GPU */
> diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
> index fdf0091..7249fcd 100644
> --- a/include/hw/virtio/virtio-gpu.h
> +++ b/include/hw/virtio/virtio-gpu.h
> @@ -107,6 +107,7 @@ typedef struct VirtIOGPU {
>
> bool use_virgl_renderer;
> bool renderer_inited;
> +bool renderer_blocked;
> QEMUTimer *fence_poll;
> QEMUTimer *print_stats;
>
> --
> 1.8.3.1
>
--
Marc-André Lureau
