| Message ID | 20240519212712.2605419-2-dmitry.osipenko@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support blob memory and venus on qemu | expand |
Dmitry Osipenko <dmitry.osipenko@collabora.com> writes: > Even though GL GPU doesn't support hotplugging today, free virgl > resources when GL device is unrealized. For consistency. > > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > --- > hw/display/virtio-gpu-gl.c | 11 +++++++++++ > hw/display/virtio-gpu-virgl.c | 6 ++++++ > include/hw/virtio/virtio-gpu.h | 1 + > 3 files changed, 18 insertions(+) > > diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c > index e06be60dfbfc..0c0a8d136954 100644 > --- a/hw/display/virtio-gpu-gl.c > +++ b/hw/display/virtio-gpu-gl.c > @@ -136,6 +136,16 @@ static Property virtio_gpu_gl_properties[] = { > DEFINE_PROP_END_OF_LIST(), > }; > > +static void virtio_gpu_gl_device_unrealize(DeviceState *qdev) > +{ > + VirtIOGPU *g = VIRTIO_GPU(qdev); > + VirtIOGPUGL *gl = VIRTIO_GPU_GL(qdev); > + > + if (gl->renderer_inited) { > + virtio_gpu_virgl_deinit(g); Should we reset the flag at this point or are we relying on the QOM lifetime to ensure *gl will be gone shortly after this? > + } > +} > + > static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > @@ -149,6 +159,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data) > vgc->update_cursor_data = virtio_gpu_gl_update_cursor_data; > > vdc->realize = virtio_gpu_gl_device_realize; > + vdc->unrealize = virtio_gpu_gl_device_unrealize; > vdc->reset = virtio_gpu_gl_reset; > device_class_set_props(dc, virtio_gpu_gl_properties); > } > diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c > index 9f34d0e6619c..6ba4c24fda1d 100644 > --- a/hw/display/virtio-gpu-virgl.c > +++ b/hw/display/virtio-gpu-virgl.c > @@ -665,3 +665,9 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g) > > return capset2_max_ver ? 2 : 1; > } > + > +void virtio_gpu_virgl_deinit(VirtIOGPU *g) > +{ > + timer_free(g->fence_poll); > + virgl_renderer_cleanup(NULL); > +} > diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h > index 56d6e821bf04..8ece1ec2e98b 100644 > --- a/include/hw/virtio/virtio-gpu.h > +++ b/include/hw/virtio/virtio-gpu.h > @@ -336,6 +336,7 @@ void virtio_gpu_virgl_fence_poll(VirtIOGPU *g); > void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g); > void virtio_gpu_virgl_reset(VirtIOGPU *g); > int virtio_gpu_virgl_init(VirtIOGPU *g); > +void virtio_gpu_virgl_deinit(VirtIOGPU *g); > int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g); > > #endif
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index e06be60dfbfc..0c0a8d136954 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -136,6 +136,16 @@ static Property virtio_gpu_gl_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static void virtio_gpu_gl_device_unrealize(DeviceState *qdev) +{ + VirtIOGPU *g = VIRTIO_GPU(qdev); + VirtIOGPUGL *gl = VIRTIO_GPU_GL(qdev); + + if (gl->renderer_inited) { + virtio_gpu_virgl_deinit(g); + } +} + static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -149,6 +159,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data) vgc->update_cursor_data = virtio_gpu_gl_update_cursor_data; vdc->realize = virtio_gpu_gl_device_realize; + vdc->unrealize = virtio_gpu_gl_device_unrealize; vdc->reset = virtio_gpu_gl_reset; device_class_set_props(dc, virtio_gpu_gl_properties); } diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 9f34d0e6619c..6ba4c24fda1d 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -665,3 +665,9 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g) return capset2_max_ver ? 2 : 1; } + +void virtio_gpu_virgl_deinit(VirtIOGPU *g) +{ + timer_free(g->fence_poll); + virgl_renderer_cleanup(NULL); +} diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 56d6e821bf04..8ece1ec2e98b 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -336,6 +336,7 @@ void virtio_gpu_virgl_fence_poll(VirtIOGPU *g); void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g); void virtio_gpu_virgl_reset(VirtIOGPU *g); int virtio_gpu_virgl_init(VirtIOGPU *g); +void virtio_gpu_virgl_deinit(VirtIOGPU *g); int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g); #endif
Even though GL GPU doesn't support hotplugging today, free virgl resources when GL device is unrealized. For consistency. Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> --- hw/display/virtio-gpu-gl.c | 11 +++++++++++ hw/display/virtio-gpu-virgl.c | 6 ++++++ include/hw/virtio/virtio-gpu.h | 1 + 3 files changed, 18 insertions(+)