ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-gpu: move virgl reset 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-5-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2021-04-30 13:35:35 +02:00
parent 37f86af087
commit 76fa8b359b
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/display/virtio-gpu-gl.c
View File

@ -23,6 +23,22 @@
#include "hw/virtio/virtio-gpu-pixman.h" #include "hw/virtio/virtio-gpu-pixman.h"
#include "hw/qdev-properties.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) static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp)
{ {
VirtIOGPU *g = VIRTIO_GPU(qdev); 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); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
vdc->realize = virtio_gpu_gl_device_realize; vdc->realize = virtio_gpu_gl_device_realize;
vdc->reset = virtio_gpu_gl_reset;
device_class_set_props(dc, virtio_gpu_gl_properties); device_class_set_props(dc, virtio_gpu_gl_properties);
} }

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

@ -1142,18 +1142,12 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
QTAILQ_INIT(&g->fenceq); QTAILQ_INIT(&g->fenceq);
} }
static void virtio_gpu_reset(VirtIODevice *vdev) 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; 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) { QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) {
virtio_gpu_resource_destroy(g, res); virtio_gpu_resource_destroy(g, res);
} }
@ -1171,17 +1165,6 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
g_free(cmd); 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)); virtio_gpu_base_reset(VIRTIO_GPU_BASE(vdev));
} }

1
include/hw/virtio/virtio-gpu.h
View File

@ -222,6 +222,7 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,
struct iovec *iov, uint32_t count); struct iovec *iov, uint32_t count);
void virtio_gpu_process_cmdq(VirtIOGPU *g); void virtio_gpu_process_cmdq(VirtIOGPU *g);
void virtio_gpu_device_realize(DeviceState *qdev, Error **errp); void virtio_gpu_device_realize(DeviceState *qdev, Error **errp);
void virtio_gpu_reset(VirtIODevice *vdev);
/* virtio-gpu-3d.c */ /* virtio-gpu-3d.c */
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,