[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/16] virtio-gpu: add virtio-vga-gl
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 16/16] virtio-gpu: add virtio-vga-gl |
Date: |
Fri, 30 Apr 2021 13:35:47 +0200 |
Add pci proxy for virtio-gpu-gl-device, with vga compatibility.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/virtio-vga-gl.c | 47 ++++++++++++++++++++++++++++++++++++++
util/module.c | 2 ++
hw/display/meson.build | 5 ++++
3 files changed, 54 insertions(+)
create mode 100644 hw/display/virtio-vga-gl.c
diff --git a/hw/display/virtio-vga-gl.c b/hw/display/virtio-vga-gl.c
new file mode 100644
index 000000000000..c971340ebb1a
--- /dev/null
+++ b/hw/display/virtio-vga-gl.c
@@ -0,0 +1,47 @@
+#include "qemu/osdep.h"
+#include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
+#include "hw/virtio/virtio-gpu.h"
+#include "hw/display/vga.h"
+#include "qapi/error.h"
+#include "qemu/module.h"
+#include "virtio-vga.h"
+#include "qom/object.h"
+
+#define TYPE_VIRTIO_VGA_GL "virtio-vga-gl"
+
+typedef struct VirtIOVGAGL VirtIOVGAGL;
+DECLARE_INSTANCE_CHECKER(VirtIOVGAGL, VIRTIO_VGA_GL,
+ TYPE_VIRTIO_VGA_GL)
+
+struct VirtIOVGAGL {
+ VirtIOVGABase parent_obj;
+
+ VirtIOGPUGL vdev;
+};
+
+static void virtio_vga_gl_inst_initfn(Object *obj)
+{
+ VirtIOVGAGL *dev = VIRTIO_VGA_GL(obj);
+
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
+ TYPE_VIRTIO_GPU_GL);
+ VIRTIO_VGA_BASE(dev)->vgpu = VIRTIO_GPU_BASE(&dev->vdev);
+}
+
+
+static VirtioPCIDeviceTypeInfo virtio_vga_gl_info = {
+ .generic_name = TYPE_VIRTIO_VGA_GL,
+ .parent = TYPE_VIRTIO_VGA_BASE,
+ .instance_size = sizeof(VirtIOVGAGL),
+ .instance_init = virtio_vga_gl_inst_initfn,
+};
+
+static void virtio_vga_register_types(void)
+{
+ if (have_vga) {
+ virtio_pci_types_register(&virtio_vga_gl_info);
+ }
+}
+
+type_init(virtio_vga_register_types)
diff --git a/util/module.c b/util/module.c
index fc545c35bcd2..eee8ff2de136 100644
--- a/util/module.c
+++ b/util/module.c
@@ -184,6 +184,7 @@ static const struct {
{ "hw-display-virtio-gpu-gl", "hw-display-virtio-gpu" },
{ "hw-display-virtio-gpu-pci-gl", "hw-display-virtio-gpu-pci" },
+ { "hw-display-virtio-vga-gl", "hw-display-virtio-vga" },
#ifdef CONFIG_OPENGL
{ "ui-egl-headless", "ui-opengl" },
@@ -313,6 +314,7 @@ static struct {
{ "virtio-gpu-ccw", "hw-", "s390x-virtio-gpu-ccw" },
{ "virtio-vga-base", "hw-", "display-virtio-vga" },
{ "virtio-vga", "hw-", "display-virtio-vga" },
+ { "virtio-vga-gl", "hw-", "display-virtio-vga-gl" },
{ "vhost-user-vga", "hw-", "display-virtio-vga" },
{ "chardev-braille", "chardev-", "baum" },
{ "chardev-spicevmc", "chardev-", "spice" },
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 8ca2e7ab6362..612cd6582d0c 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -87,6 +87,11 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
if_true: files('vhost-user-vga.c'))
hw_display_modules += {'virtio-vga': virtio_vga_ss}
+
+ virtio_vga_gl_ss = ss.source_set()
+ virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', 'CONFIG_VIRGL', opengl],
+ if_true: [files('virtio-vga-gl.c'), pixman])
+ hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
endif
specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true:
files('milkymist-tmu2.c'))
--
2.30.2
- [PATCH v2 04/16] virtio-gpu: move virgl reset, (continued)
- [PATCH v2 04/16] virtio-gpu: move virgl reset, Gerd Hoffmann, 2021/04/30
- [PATCH v2 07/16] virtio-gpu: move virgl gl_flushed, Gerd Hoffmann, 2021/04/30
- [PATCH v2 08/16] virtio-gpu: move virgl process_cmd, Gerd Hoffmann, 2021/04/30
- [PATCH v2 10/16] virtio-gpu: drop VIRGL() macro, Gerd Hoffmann, 2021/04/30
- [PATCH v2 09/16] virtio-gpu: move update_cursor_data, Gerd Hoffmann, 2021/04/30
- [PATCH v2 12/16] virtio-gpu: drop use_virgl_renderer, Gerd Hoffmann, 2021/04/30
- [PATCH v2 11/16] virtio-gpu: move virtio-gpu-gl-device to separate module, Gerd Hoffmann, 2021/04/30
- [PATCH v2 14/16] virtio-gpu: add virtio-gpu-gl-pci, Gerd Hoffmann, 2021/04/30
- [PATCH v2 13/16] virtio-gpu: move fields to struct VirtIOGPUGL, Gerd Hoffmann, 2021/04/30
- [PATCH v2 15/16] modules: add have_vga, Gerd Hoffmann, 2021/04/30
- [PATCH v2 16/16] virtio-gpu: add virtio-vga-gl,
Gerd Hoffmann <=
- Re: [PATCH v2 00/16] virtio-gpu: split into two devices., no-reply, 2021/04/30
- Re: [PATCH v2 00/16] virtio-gpu: split into two devices., Marc-André Lureau, 2021/04/30