[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/16] virtio-gpu: move virgl reset
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 04/16] virtio-gpu: move virgl reset |
Date: |
Fri, 30 Apr 2021 13:35:35 +0200 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 1 +
hw/display/virtio-gpu-gl.c | 17 +++++++++++++++++
hw/display/virtio-gpu.c | 19 +------------------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 4c1a8faebec9..a7b7d78310ea 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -221,6 +221,7 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,
struct iovec *iov, uint32_t count);
void virtio_gpu_process_cmdq(VirtIOGPU *g);
void virtio_gpu_device_realize(DeviceState *qdev, Error **errp);
+void virtio_gpu_reset(VirtIODevice *vdev);
/* virtio-gpu-3d.c */
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index 9b7b5f00d7e6..c3e562f835f7 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -23,6 +23,22 @@
#include "hw/virtio/virtio-gpu-pixman.h"
#include "hw/qdev-properties.h"
+static void virtio_gpu_gl_reset(VirtIODevice *vdev)
+{
+ VirtIOGPU *g = VIRTIO_GPU(vdev);
+
+ virtio_gpu_reset(vdev);
+
+ if (g->parent_obj.use_virgl_renderer) {
+ if (g->parent_obj.renderer_blocked) {
+ g->renderer_reset = true;
+ } else {
+ virtio_gpu_virgl_reset(g);
+ }
+ g->parent_obj.use_virgl_renderer = false;
+ }
+}
+
static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp)
{
VirtIOGPU *g = VIRTIO_GPU(qdev);
@@ -56,6 +72,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void
*data)
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
vdc->realize = virtio_gpu_gl_device_realize;
+ vdc->reset = virtio_gpu_gl_reset;
device_class_set_props(dc, virtio_gpu_gl_properties);
}
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 2ee6ba756aba..68286f75a01a 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1126,18 +1126,12 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error
**errp)
QTAILQ_INIT(&g->fenceq);
}
-static void virtio_gpu_reset(VirtIODevice *vdev)
+void virtio_gpu_reset(VirtIODevice *vdev)
{
VirtIOGPU *g = VIRTIO_GPU(vdev);
struct virtio_gpu_simple_resource *res, *tmp;
struct virtio_gpu_ctrl_command *cmd;
-#ifdef CONFIG_VIRGL
- if (g->parent_obj.use_virgl_renderer) {
- virtio_gpu_virgl_reset(g);
- }
-#endif
-
QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) {
virtio_gpu_resource_destroy(g, res);
}
@@ -1155,17 +1149,6 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
g_free(cmd);
}
-#ifdef CONFIG_VIRGL
- if (g->parent_obj.use_virgl_renderer) {
- if (g->parent_obj.renderer_blocked) {
- g->renderer_reset = true;
- } else {
- virtio_gpu_virgl_reset(g);
- }
- g->parent_obj.use_virgl_renderer = false;
- }
-#endif
-
virtio_gpu_base_reset(VIRTIO_GPU_BASE(vdev));
}
--
2.30.2
- [PATCH v2 00/16] virtio-gpu: split into two devices., Gerd Hoffmann, 2021/04/30
- [PATCH v2 01/16] virtio-gpu: rename virgl source file., Gerd Hoffmann, 2021/04/30
- [PATCH v2 03/16] virtio-gpu: move virgl realize + properties, Gerd Hoffmann, 2021/04/30
- [PATCH v2 05/16] virtio-gpu: use class function for ctrl queue handlers, Gerd Hoffmann, 2021/04/30
- [PATCH v2 02/16] virtio-gpu: add virtio-gpu-gl-device, Gerd Hoffmann, 2021/04/30
- [PATCH v2 06/16] virtio-gpu: move virgl handle_ctrl, Gerd Hoffmann, 2021/04/30
- [PATCH v2 04/16] virtio-gpu: move virgl reset,
Gerd Hoffmann <=
- [PATCH v2 07/16] virtio-gpu: move virgl gl_flushed, Gerd Hoffmann, 2021/04/30
- [PATCH v2 08/16] virtio-gpu: move virgl process_cmd, Gerd Hoffmann, 2021/04/30
- [PATCH v2 10/16] virtio-gpu: drop VIRGL() macro, Gerd Hoffmann, 2021/04/30
- [PATCH v2 09/16] virtio-gpu: move update_cursor_data, Gerd Hoffmann, 2021/04/30
- [PATCH v2 12/16] virtio-gpu: drop use_virgl_renderer, Gerd Hoffmann, 2021/04/30
- [PATCH v2 11/16] virtio-gpu: move virtio-gpu-gl-device to separate module, Gerd Hoffmann, 2021/04/30
- [PATCH v2 14/16] virtio-gpu: add virtio-gpu-gl-pci, Gerd Hoffmann, 2021/04/30
- [PATCH v2 13/16] virtio-gpu: move fields to struct VirtIOGPUGL, Gerd Hoffmann, 2021/04/30
- [PATCH v2 15/16] modules: add have_vga, Gerd Hoffmann, 2021/04/30
- [PATCH v2 16/16] virtio-gpu: add virtio-vga-gl, Gerd Hoffmann, 2021/04/30