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 process_cmd 

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

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

@ -23,6 +23,16 @@
#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_process_cmd(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd)
{
if (g->parent_obj.use_virgl_renderer) {
virtio_gpu_virgl_process_cmd(g, cmd);
return;
}
virtio_gpu_simple_process_cmd(g, cmd);
}
static void virtio_gpu_gl_flushed(VirtIOGPUBase *b) static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
{ {
VirtIOGPU *g = VIRTIO_GPU(b); VirtIOGPU *g = VIRTIO_GPU(b);
@ -116,6 +126,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data)
vbc->gl_flushed = virtio_gpu_gl_flushed; vbc->gl_flushed = virtio_gpu_gl_flushed;
vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl; vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl;
vgc->process_cmd = virtio_gpu_gl_process_cmd;
vdc->realize = virtio_gpu_gl_device_realize; vdc->realize = virtio_gpu_gl_device_realize;
vdc->reset = virtio_gpu_gl_reset; vdc->reset = virtio_gpu_gl_reset;

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

@ -763,7 +763,7 @@ virtio_gpu_resource_detach_backing(VirtIOGPU *g,
virtio_gpu_cleanup_mapping(g, res); virtio_gpu_cleanup_mapping(g, res);
} }
static void virtio_gpu_simple_process_cmd(VirtIOGPU *g, void virtio_gpu_simple_process_cmd(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd) struct virtio_gpu_ctrl_command *cmd)
{ {
VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr); VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr);
@ -822,6 +822,7 @@ static void virtio_gpu_handle_cursor_cb(VirtIODevice *vdev, VirtQueue *vq)
void virtio_gpu_process_cmdq(VirtIOGPU *g) void virtio_gpu_process_cmdq(VirtIOGPU *g)
{ {
struct virtio_gpu_ctrl_command *cmd; struct virtio_gpu_ctrl_command *cmd;
VirtIOGPUClass *vgc = VIRTIO_GPU_GET_CLASS(g);
if (g->processing_cmdq) { if (g->processing_cmdq) {
return; return;
@ -835,8 +836,7 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g)
} }
/* process command */ /* process command */
VIRGL(g, virtio_gpu_virgl_process_cmd, virtio_gpu_simple_process_cmd, vgc->process_cmd(g, cmd);
g, cmd);
QTAILQ_REMOVE(&g->cmdq, cmd, next); QTAILQ_REMOVE(&g->cmdq, cmd, next);
if (virtio_gpu_stats_enabled(g->parent_obj.conf)) { if (virtio_gpu_stats_enabled(g->parent_obj.conf)) {
@ -1205,6 +1205,7 @@ static void virtio_gpu_class_init(ObjectClass *klass, void *data)
VirtIOGPUClass *vgc = VIRTIO_GPU_CLASS(klass); VirtIOGPUClass *vgc = VIRTIO_GPU_CLASS(klass);
vgc->handle_ctrl = virtio_gpu_handle_ctrl; vgc->handle_ctrl = virtio_gpu_handle_ctrl;
vgc->process_cmd = virtio_gpu_simple_process_cmd;
vdc->realize = virtio_gpu_device_realize; vdc->realize = virtio_gpu_device_realize;
vdc->reset = virtio_gpu_reset; vdc->reset = virtio_gpu_reset;

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

@ -170,6 +170,7 @@ struct VirtIOGPUClass {
VirtIOGPUBaseClass parent; VirtIOGPUBaseClass parent;
void (*handle_ctrl)(VirtIODevice *vdev, VirtQueue *vq); void (*handle_ctrl)(VirtIODevice *vdev, VirtQueue *vq);
void (*process_cmd)(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd);
}; };
struct VirtIOGPUGL { struct VirtIOGPUGL {
@ -229,6 +230,7 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,
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); void virtio_gpu_reset(VirtIODevice *vdev);
void virtio_gpu_simple_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd);
/* virtio-gpu-3d.c */ /* virtio-gpu-3d.c */
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,