[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/15] virtio-gpu: add virtio-gpu-gl-device
From: |
Gerd Hoffmann |
Subject: |
[PATCH 02/15] virtio-gpu: add virtio-gpu-gl-device |
Date: |
Fri, 19 Mar 2021 12:21:34 +0100 |
Just a skeleton for starters, following patches will add more code.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 7 ++++++
hw/display/virtio-gpu-gl.c | 41 ++++++++++++++++++++++++++++++++++
util/module.c | 1 +
hw/display/meson.build | 2 +-
4 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 hw/display/virtio-gpu-gl.c
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index fae149235c58..8ee6b8fe0fb8 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -31,6 +31,9 @@ OBJECT_DECLARE_TYPE(VirtIOGPUBase, VirtIOGPUBaseClass,
#define TYPE_VIRTIO_GPU "virtio-gpu-device"
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPU, VIRTIO_GPU)
+#define TYPE_VIRTIO_GPU_GL "virtio-gpu-gl-device"
+OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPUGL, VIRTIO_GPU_GL)
+
#define TYPE_VHOST_USER_GPU "vhost-user-gpu"
OBJECT_DECLARE_SIMPLE_TYPE(VhostUserGPU, VHOST_USER_GPU)
@@ -163,6 +166,10 @@ struct VirtIOGPU {
} stats;
};
+struct VirtIOGPUGL {
+ struct VirtIOGPU parent_obj;
+};
+
struct VhostUserGPU {
VirtIOGPUBase parent_obj;
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
new file mode 100644
index 000000000000..a477cbe186d3
--- /dev/null
+++ b/hw/display/virtio-gpu-gl.c
@@ -0,0 +1,41 @@
+/*
+ * Virtio GPU Device
+ *
+ * Copyright Red Hat, Inc. 2013-2014
+ *
+ * Authors:
+ * Dave Airlie <airlied@redhat.com>
+ * Gerd Hoffmann <kraxel@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/iov.h"
+#include "qemu/module.h"
+#include "qemu/error-report.h"
+#include "qapi/error.h"
+#include "hw/virtio/virtio.h"
+#include "hw/virtio/virtio-gpu.h"
+#include "hw/virtio/virtio-gpu-bswap.h"
+#include "hw/virtio/virtio-gpu-pixman.h"
+#include "hw/qdev-properties.h"
+
+static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data)
+{
+}
+
+static const TypeInfo virtio_gpu_gl_info = {
+ .name = TYPE_VIRTIO_GPU_GL,
+ .parent = TYPE_VIRTIO_GPU,
+ .instance_size = sizeof(VirtIOGPUGL),
+ .class_init = virtio_gpu_gl_class_init,
+};
+
+static void virtio_register_types(void)
+{
+ type_register_static(&virtio_gpu_gl_info);
+}
+
+type_init(virtio_register_types)
diff --git a/util/module.c b/util/module.c
index c65060c167df..fb80b85fe606 100644
--- a/util/module.c
+++ b/util/module.c
@@ -300,6 +300,7 @@ static struct {
{ "qxl-vga", "hw-", "display-qxl" },
{ "qxl", "hw-", "display-qxl" },
{ "virtio-gpu-device", "hw-", "display-virtio-gpu" },
+ { "virtio-gpu-gl-device", "hw-", "display-virtio-gpu" },
{ "vhost-user-gpu", "hw-", "display-virtio-gpu" },
{ "virtio-gpu-pci-base", "hw-", "display-virtio-gpu-pci" },
{ "virtio-gpu-pci", "hw-", "display-virtio-gpu-pci" },
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 8e465731b85b..5161efa08a6e 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -58,7 +58,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU',
if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'),
pixman, virgl])
virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL'],
- if_true: [files('virtio-gpu-virgl.c'), pixman, virgl])
+ if_true: [files('virtio-gpu-gl.c', 'virtio-gpu-virgl.c'),
pixman, virgl])
virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true:
files('vhost-user-gpu.c'))
hw_display_modules += {'virtio-gpu': virtio_gpu_ss}
endif
--
2.30.2
- [PATCH 00/15] virtio-gpu: split into two devices., Gerd Hoffmann, 2021/03/19
- [PATCH 03/15] virtio-gpu: add virtio-gpu-gl-pci, Gerd Hoffmann, 2021/03/19
- [PATCH 01/15] virtio-gpu: rename virgl source file., Gerd Hoffmann, 2021/03/19
- [PATCH 02/15] virtio-gpu: add virtio-gpu-gl-device,
Gerd Hoffmann <=
- [PATCH 04/15] virtio-gpu: add virtio-vga-gl, Gerd Hoffmann, 2021/03/19
- [PATCH 12/15] virtio-gpu: drop VIRGL() macro, Gerd Hoffmann, 2021/03/19
- [PATCH 07/15] virtio-gpu: use class function for ctrl queue handlers, Gerd Hoffmann, 2021/03/19
- [PATCH 11/15] virtio-gpu: move update_cursor_data, Gerd Hoffmann, 2021/03/19
- [PATCH 09/15] virtio-gpu: move virgl gl_flushed, Gerd Hoffmann, 2021/03/19
- [PATCH 05/15] virtio-gpu: move virgl realize + properties, Gerd Hoffmann, 2021/03/19
- [PATCH 06/15] virtio-gpu: move virgl reset, Gerd Hoffmann, 2021/03/19
- [PATCH 08/15] virtio-gpu: move virgl handle_ctrl, Gerd Hoffmann, 2021/03/19
- [PATCH 13/15] virtio-gpu: move virtio-gpu-gl-device to separate module, Gerd Hoffmann, 2021/03/19
- [PATCH 15/15] virtio-gpu: move fields to struct VirtIOGPUGL, Gerd Hoffmann, 2021/03/19