diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-03-14 12:53:58 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-03-18 13:10:57 +0100 |
| commit | dc84ed5b57cc6d06955e2f49ade9dca277e92cd4 (patch) | |
| tree | 4806c917a8516c4e41a2ae7aa0863aff25e8488d /hw/display | |
| parent | 9032e3d71c9950e48a204dd15b8d2e24254ffd7c (diff) | |
| download | focaccia-qemu-dc84ed5b57cc6d06955e2f49ade9dca277e92cd4.tar.gz focaccia-qemu-dc84ed5b57cc6d06955e2f49ade9dca277e92cd4.zip | |
virtio-gpu: clear command and fence queues on reset
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 <kraxel@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20190314115358.26678-3-kraxel@redhat.com
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/virtio-gpu.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index fbd8d908ad..9e37e0ac96 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); + } + #ifdef CONFIG_VIRGL if (g->use_virgl_renderer) { if (g->renderer_blocked) { |