[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/2] virtio-gpu: clear command and fence queu
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/2] virtio-gpu: clear command and fence queues on reset |
Date: |
Thu, 14 Mar 2019 13:04:20 +0100 |
Hi
On Thu, Mar 14, 2019 at 12:54 PM Gerd Hoffmann <address@hidden> wrote:
>
> It was never correct to not clear them. Due to commit "3912e66a3feb
> virtio-vga: fix reset." this became more obvious though. The virtio
> rings get properly reset now, and trying to process the stale commands
> will trigger an assert in the virtio core.
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
> hw/display/virtio-gpu.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
> index fbd8d908ad32..9e37e0ac96b7 100644
> --- a/hw/display/virtio-gpu.c
> +++ b/hw/display/virtio-gpu.c
> @@ -1356,6 +1356,7 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
> {
> VirtIOGPU *g = VIRTIO_GPU(vdev);
> struct virtio_gpu_simple_resource *res, *tmp;
> + struct virtio_gpu_ctrl_command *cmd;
> int i;
>
> g->enable = 0;
> @@ -1372,6 +1373,19 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
> g->scanout[i].ds = NULL;
> }
>
> + while (!QTAILQ_EMPTY(&g->cmdq)) {
> + cmd = QTAILQ_FIRST(&g->cmdq);
> + QTAILQ_REMOVE(&g->cmdq, cmd, next);
> + g_free(cmd);
> + }
> +
> + while (!QTAILQ_EMPTY(&g->fenceq)) {
> + cmd = QTAILQ_FIRST(&g->fenceq);
> + QTAILQ_REMOVE(&g->fenceq, cmd, next);
> + g->inflight--;
> + g_free(cmd);
> + }
> +
Reviewed-by: Marc-André Lureau <address@hidden>
> #ifdef CONFIG_VIRGL
> if (g->use_virgl_renderer) {
> if (g->renderer_blocked) {
> --
> 2.18.1
>
>
--
Marc-André Lureau