[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/25] virtio-gpu: add virtio-gpu-gl-pci
From: |
Gerd Hoffmann |
Subject: |
[PULL 23/25] virtio-gpu: add virtio-gpu-gl-pci |
Date: |
Mon, 10 May 2021 15:20:49 +0200 |
Add pci proxy for virtio-gpu-gl-device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-15-kraxel@redhat.com>
---
hw/display/virtio-gpu-pci-gl.c | 55 ++++++++++++++++++++++++++++++++++
util/module.c | 2 ++
hw/display/meson.build | 5 ++++
3 files changed, 62 insertions(+)
create mode 100644 hw/display/virtio-gpu-pci-gl.c
diff --git a/hw/display/virtio-gpu-pci-gl.c b/hw/display/virtio-gpu-pci-gl.c
new file mode 100644
index 000000000000..902dda345275
--- /dev/null
+++ b/hw/display/virtio-gpu-pci-gl.c
@@ -0,0 +1,55 @@
+/*
+ * Virtio video device
+ *
+ * Copyright Red Hat
+ *
+ * Authors:
+ * Dave Airlie
+ *
+ * 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 "qapi/error.h"
+#include "qemu/module.h"
+#include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
+#include "hw/virtio/virtio.h"
+#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-gpu-pci.h"
+#include "qom/object.h"
+
+#define TYPE_VIRTIO_GPU_GL_PCI "virtio-gpu-gl-pci"
+typedef struct VirtIOGPUGLPCI VirtIOGPUGLPCI;
+DECLARE_INSTANCE_CHECKER(VirtIOGPUGLPCI, VIRTIO_GPU_GL_PCI,
+ TYPE_VIRTIO_GPU_GL_PCI)
+
+struct VirtIOGPUGLPCI {
+ VirtIOGPUPCIBase parent_obj;
+ VirtIOGPUGL vdev;
+};
+
+static void virtio_gpu_gl_initfn(Object *obj)
+{
+ VirtIOGPUGLPCI *dev = VIRTIO_GPU_GL_PCI(obj);
+
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
+ TYPE_VIRTIO_GPU_GL);
+ VIRTIO_GPU_PCI_BASE(obj)->vgpu = VIRTIO_GPU_BASE(&dev->vdev);
+}
+
+static const VirtioPCIDeviceTypeInfo virtio_gpu_gl_pci_info = {
+ .generic_name = TYPE_VIRTIO_GPU_GL_PCI,
+ .parent = TYPE_VIRTIO_GPU_PCI_BASE,
+ .instance_size = sizeof(VirtIOGPUGLPCI),
+ .instance_init = virtio_gpu_gl_initfn,
+};
+
+static void virtio_gpu_gl_pci_register_types(void)
+{
+ virtio_pci_types_register(&virtio_gpu_gl_pci_info);
+}
+
+type_init(virtio_gpu_gl_pci_register_types)
diff --git a/util/module.c b/util/module.c
index c8f3e5a0a736..fc545c35bcd2 100644
--- a/util/module.c
+++ b/util/module.c
@@ -183,6 +183,7 @@ static const struct {
{ "ui-spice-app", "chardev-spice" },
{ "hw-display-virtio-gpu-gl", "hw-display-virtio-gpu" },
+ { "hw-display-virtio-gpu-pci-gl", "hw-display-virtio-gpu-pci" },
#ifdef CONFIG_OPENGL
{ "ui-egl-headless", "ui-opengl" },
@@ -307,6 +308,7 @@ static struct {
{ "vhost-user-gpu", "hw-", "display-virtio-gpu" },
{ "virtio-gpu-pci-base", "hw-", "display-virtio-gpu-pci" },
{ "virtio-gpu-pci", "hw-", "display-virtio-gpu-pci" },
+ { "virtio-gpu-gl-pci", "hw-", "display-virtio-gpu-pci-gl" },
{ "vhost-user-gpu-pci", "hw-", "display-virtio-gpu-pci" },
{ "virtio-gpu-ccw", "hw-", "s390x-virtio-gpu-ccw" },
{ "virtio-vga-base", "hw-", "display-virtio-vga" },
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 3c3e47c47ed1..8ca2e7ab6362 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -73,6 +73,11 @@ if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
virtio_gpu_pci_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'],
if_true: files('vhost-user-gpu-pci.c'))
hw_display_modules += {'virtio-gpu-pci': virtio_gpu_pci_ss}
+
+ virtio_gpu_pci_gl_ss = ss.source_set()
+ virtio_gpu_pci_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI',
'CONFIG_VIRGL', opengl],
+ if_true: [files('virtio-gpu-pci-gl.c'), pixman])
+ hw_display_modules += {'virtio-gpu-pci-gl': virtio_gpu_pci_gl_ss}
endif
if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
--
2.31.1
- [PULL 14/25] virtio-gpu: use class function for ctrl queue handlers, (continued)
- [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, 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 <=
- [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