OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-gpu: clear command and fence queues on reset

Browse Source 
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
This commit is contained in:
Gerd Hoffmann 2019-03-14 12:53:58 +01:00
parent 9032e3d71c
commit dc84ed5b57
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/display/virtio-gpu.c
View File

@ -1356,6 +1356,7 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
{ {
VirtIOGPU *g = VIRTIO_GPU(vdev); VirtIOGPU *g = VIRTIO_GPU(vdev);
struct virtio_gpu_simple_resource *res, *tmp; struct virtio_gpu_simple_resource *res, *tmp;
struct virtio_gpu_ctrl_command *cmd;
int i; int i;
g->enable = 0; g->enable = 0;
@ -1372,6 +1373,19 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
g->scanout[i].ds = NULL; 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 #ifdef CONFIG_VIRGL
if (g->use_virgl_renderer) { if (g->use_virgl_renderer) {
if (g->renderer_blocked) { if (g->renderer_blocked) {