[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/25] virtio-gpu: move virgl handle_ctrl
From: |
Gerd Hoffmann |
Subject: |
[PULL 15/25] virtio-gpu: move virgl handle_ctrl |
Date: |
Mon, 10 May 2021 15:20:41 +0200 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-7-kraxel@redhat.com>
---
hw/display/virtio-gpu-gl.c | 33 +++++++++++++++++++++++++++++++++
hw/display/virtio-gpu.c | 13 -------------
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index c3e562f835f7..6d0ce5bcd6f1 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -23,6 +23,36 @@
#include "hw/virtio/virtio-gpu-pixman.h"
#include "hw/qdev-properties.h"
+static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
+{
+ VirtIOGPU *g = VIRTIO_GPU(vdev);
+ struct virtio_gpu_ctrl_command *cmd;
+
+ if (!virtio_queue_ready(vq)) {
+ return;
+ }
+
+ if (!g->renderer_inited && g->parent_obj.use_virgl_renderer) {
+ virtio_gpu_virgl_init(g);
+ g->renderer_inited = true;
+ }
+
+ cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));
+ while (cmd) {
+ cmd->vq = vq;
+ cmd->error = 0;
+ cmd->finished = false;
+ QTAILQ_INSERT_TAIL(&g->cmdq, cmd, next);
+ cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));
+ }
+
+ virtio_gpu_process_cmdq(g);
+
+ if (g->parent_obj.use_virgl_renderer) {
+ virtio_gpu_virgl_fence_poll(g);
+ }
+}
+
static void virtio_gpu_gl_reset(VirtIODevice *vdev)
{
VirtIOGPU *g = VIRTIO_GPU(vdev);
@@ -70,6 +100,9 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+ VirtIOGPUClass *vgc = VIRTIO_GPU_CLASS(klass);
+
+ vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl;
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 f25b079a9d0c..dfb6c0a9ef76 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -881,13 +881,6 @@ static void virtio_gpu_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
return;
}
-#ifdef CONFIG_VIRGL
- if (!g->renderer_inited && g->parent_obj.use_virgl_renderer) {
- virtio_gpu_virgl_init(g);
- g->renderer_inited = true;
- }
-#endif
-
cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));
while (cmd) {
cmd->vq = vq;
@@ -898,12 +891,6 @@ static void virtio_gpu_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
}
virtio_gpu_process_cmdq(g);
-
-#ifdef CONFIG_VIRGL
- if (g->parent_obj.use_virgl_renderer) {
- virtio_gpu_virgl_fence_poll(g);
- }
-#endif
}
static void virtio_gpu_ctrl_bh(void *opaque)
--
2.31.1
- [PULL 05/25] edid: Make refresh rate configurable, (continued)
- [PULL 05/25] edid: Make refresh rate configurable, Gerd Hoffmann, 2021/05/10
- [PULL 06/25] edid: move timing generation into a separate function, Gerd Hoffmann, 2021/05/10
- [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 <=
- [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, 2021/05/10
- [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