[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/25] virtio-gpu: move virgl process_cmd
From: |
Gerd Hoffmann |
Subject: |
[PULL 17/25] virtio-gpu: move virgl process_cmd |
Date: |
Mon, 10 May 2021 15:20:43 +0200 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-9-kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 2 ++
hw/display/virtio-gpu-gl.c | 11 +++++++++++
hw/display/virtio-gpu.c | 9 +++++----
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 7ac9229c639c..c7bc925998d5 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -170,6 +170,7 @@ struct VirtIOGPUClass {
VirtIOGPUBaseClass parent;
void (*handle_ctrl)(VirtIODevice *vdev, VirtQueue *vq);
+ void (*process_cmd)(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd);
};
struct VirtIOGPUGL {
@@ -229,6 +230,7 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,
void virtio_gpu_process_cmdq(VirtIOGPU *g);
void virtio_gpu_device_realize(DeviceState *qdev, Error **errp);
void virtio_gpu_reset(VirtIODevice *vdev);
+void virtio_gpu_simple_process_cmd(VirtIOGPU *g, struct
virtio_gpu_ctrl_command *cmd);
/* 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 e976fb8d04c4..792cc0b41256 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -23,6 +23,16 @@
#include "hw/virtio/virtio-gpu-pixman.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)
{
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;
vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl;
+ vgc->process_cmd = virtio_gpu_gl_process_cmd;
vdc->realize = virtio_gpu_gl_device_realize;
vdc->reset = virtio_gpu_gl_reset;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 9be486bb8121..7c65c3ffe8f2 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -763,8 +763,8 @@ virtio_gpu_resource_detach_backing(VirtIOGPU *g,
virtio_gpu_cleanup_mapping(g, res);
}
-static void virtio_gpu_simple_process_cmd(VirtIOGPU *g,
- struct virtio_gpu_ctrl_command *cmd)
+void virtio_gpu_simple_process_cmd(VirtIOGPU *g,
+ struct virtio_gpu_ctrl_command *cmd)
{
VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr);
virtio_gpu_ctrl_hdr_bswap(&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)
{
struct virtio_gpu_ctrl_command *cmd;
+ VirtIOGPUClass *vgc = VIRTIO_GPU_GET_CLASS(g);
if (g->processing_cmdq) {
return;
@@ -835,8 +836,7 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g)
}
/* process command */
- VIRGL(g, virtio_gpu_virgl_process_cmd, virtio_gpu_simple_process_cmd,
- g, cmd);
+ vgc->process_cmd(g, cmd);
QTAILQ_REMOVE(&g->cmdq, cmd, next);
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);
vgc->handle_ctrl = virtio_gpu_handle_ctrl;
+ vgc->process_cmd = virtio_gpu_simple_process_cmd;
vdc->realize = virtio_gpu_device_realize;
vdc->reset = virtio_gpu_reset;
--
2.31.1
- [PULL 08/25] edid: add support for DisplayID extension (5k resolution), (continued)
- [PULL 08/25] edid: add support for DisplayID extension (5k resolution), Gerd Hoffmann, 2021/05/10
- [PULL 07/25] edid: allow arbitrary-length checksums, Gerd Hoffmann, 2021/05/10
- [PULL 10/25] virtio-gpu: rename virgl source file., Gerd Hoffmann, 2021/05/10
- [PULL 11/25] virtio-gpu: add virtio-gpu-gl-device, Gerd Hoffmann, 2021/05/10
- [PULL 12/25] virtio-gpu: move virgl realize + properties, Gerd Hoffmann, 2021/05/10
- [PULL 09/25] virtio-gpu: handle partial maps properly, Gerd Hoffmann, 2021/05/10
- [PULL 14/25] virtio-gpu: use class function for ctrl queue handlers, Gerd Hoffmann, 2021/05/10
- [PULL 13/25] virtio-gpu: move virgl reset, Gerd Hoffmann, 2021/05/10
- [PULL 15/25] virtio-gpu: move virgl handle_ctrl, Gerd Hoffmann, 2021/05/10
- [PULL 16/25] virtio-gpu: move virgl gl_flushed, Gerd Hoffmann, 2021/05/10
- [PULL 17/25] virtio-gpu: move virgl process_cmd,
Gerd Hoffmann <=
- [PULL 18/25] virtio-gpu: move update_cursor_data, Gerd Hoffmann, 2021/05/10
- [PULL 20/25] virtio-gpu: move virtio-gpu-gl-device to separate module, Gerd Hoffmann, 2021/05/10
- [PULL 19/25] virtio-gpu: drop VIRGL() macro, Gerd Hoffmann, 2021/05/10
- [PULL 21/25] virtio-gpu: drop use_virgl_renderer, Gerd Hoffmann, 2021/05/10
- [PULL 22/25] virtio-gpu: move fields to struct VirtIOGPUGL, Gerd Hoffmann, 2021/05/10
- [PULL 23/25] virtio-gpu: add virtio-gpu-gl-pci, Gerd Hoffmann, 2021/05/10
- [PULL 24/25] modules: add have_vga, Gerd Hoffmann, 2021/05/10
- [PULL 25/25] virtio-gpu: add virtio-vga-gl, Gerd Hoffmann, 2021/05/10
- Re: [PULL 00/25] Vga 20210510 patches, no-reply, 2021/05/10
- Re: [PULL 00/25] Vga 20210510 patches, Peter Maydell, 2021/05/12