diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2021-07-02 16:32:21 +0400 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2021-07-22 15:46:54 +0200 |
| commit | 8a13b9bc0f283caff4333c75bc396a963f47ce5c (patch) | |
| tree | 19485f90645679004cf8bd04d2c68f3be428c916 /hw/display/virtio-gpu-virgl.c | |
| parent | f29d52611c73347a2fc0fcea62e6197383b18fd1 (diff) | |
| download | focaccia-qemu-8a13b9bc0f283caff4333c75bc396a963f47ce5c.tar.gz focaccia-qemu-8a13b9bc0f283caff4333c75bc396a963f47ce5c.zip | |
hw/display: fix virgl reset regression
Before commit 49afbca3b00e8e517d54964229a794b51768deaf ("virtio-gpu: drop
use_virgl_renderer"), use_virgl_renderer was preventing calling GL
functions from non-GL context threads. The innocuously looking
g->parent_obj.use_virgl_renderer = false;
was set the first time virtio_gpu_gl_reset() was called, during
pc_machine_reset() in the main thread. Further virtio_gpu_gl_reset()
calls in IO threads, without associated GL context, were thus skipping
GL calls and avoided warnings or crashes (see also
https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/226).
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210702123221.942432-1-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display/virtio-gpu-virgl.c')
| -rw-r--r-- | hw/display/virtio-gpu-virgl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 092c6dc380..18d054922f 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -588,17 +588,21 @@ void virtio_gpu_virgl_fence_poll(VirtIOGPU *g) virtio_gpu_fence_poll(g); } -void virtio_gpu_virgl_reset(VirtIOGPU *g) +void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g) { int i; - virgl_renderer_reset(); for (i = 0; i < g->parent_obj.conf.max_outputs; i++) { dpy_gfx_replace_surface(g->parent_obj.scanout[i].con, NULL); dpy_gl_scanout_disable(g->parent_obj.scanout[i].con); } } +void virtio_gpu_virgl_reset(VirtIOGPU *g) +{ + virgl_renderer_reset(); +} + int virtio_gpu_virgl_init(VirtIOGPU *g) { int ret; |