From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 25/25] virtio-gpu: add virtio-vga-gl
Date: Mon, 10 May 2021 15:20:51 +0200 [thread overview]
Message-ID: <20210510132051.2208563-26-kraxel@redhat.com> (raw)
In-Reply-To: <20210510132051.2208563-1-kraxel@redhat.com>
Add pci proxy for virtio-gpu-gl-device, with vga compatibility.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-17-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.31.1
next prev parent reply other threads:[~2021-05-10 13:36 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 13:20 [PULL 00/25] Vga 20210510 patches Gerd Hoffmann
2021-05-10 13:20 ` [PULL 01/25] qemu-edid: use qemu_edid_size() Gerd Hoffmann
2021-05-10 13:20 ` [PULL 02/25] edid: edid_desc_next Gerd Hoffmann
2021-05-10 13:20 ` [PULL 03/25] edid: move xtra3 descriptor Gerd Hoffmann
2021-05-10 13:20 ` [PULL 04/25] edid: use dta extension block descriptors Gerd Hoffmann
2021-05-10 13:20 ` [PULL 05/25] edid: Make refresh rate configurable Gerd Hoffmann
2021-05-10 13:20 ` [PULL 06/25] edid: move timing generation into a separate function Gerd Hoffmann
2021-05-10 13:20 ` [PULL 07/25] edid: allow arbitrary-length checksums Gerd Hoffmann
2021-05-10 13:20 ` [PULL 08/25] edid: add support for DisplayID extension (5k resolution) Gerd Hoffmann
2021-05-10 13:20 ` [PULL 09/25] virtio-gpu: handle partial maps properly Gerd Hoffmann
2021-05-10 13:20 ` [PULL 10/25] virtio-gpu: rename virgl source file Gerd Hoffmann
2021-05-10 13:20 ` [PULL 11/25] virtio-gpu: add virtio-gpu-gl-device Gerd Hoffmann
2021-05-10 13:20 ` [PULL 12/25] virtio-gpu: move virgl realize + properties Gerd Hoffmann
2021-05-21 9:32 ` Michal Prívozník
2021-05-21 10:50 ` Marc-André Lureau
2021-05-21 13:45 ` Gerd Hoffmann
2021-05-21 13:57 ` Gerd Hoffmann
2021-05-10 13:20 ` [PULL 13/25] virtio-gpu: move virgl reset Gerd Hoffmann
2021-05-10 13:20 ` [PULL 14/25] virtio-gpu: use class function for ctrl queue handlers Gerd Hoffmann
2021-05-10 13:20 ` [PULL 15/25] virtio-gpu: move virgl handle_ctrl Gerd Hoffmann
2021-05-10 13:20 ` [PULL 16/25] virtio-gpu: move virgl gl_flushed Gerd Hoffmann
2021-05-10 13:20 ` [PULL 17/25] virtio-gpu: move virgl process_cmd Gerd Hoffmann
2021-05-10 13:20 ` [PULL 18/25] virtio-gpu: move update_cursor_data Gerd Hoffmann
2021-05-10 13:20 ` [PULL 19/25] virtio-gpu: drop VIRGL() macro Gerd Hoffmann
2021-05-10 13:20 ` [PULL 20/25] virtio-gpu: move virtio-gpu-gl-device to separate module Gerd Hoffmann
2021-05-10 13:20 ` [PULL 21/25] virtio-gpu: drop use_virgl_renderer Gerd Hoffmann
2021-05-10 13:20 ` [PULL 22/25] virtio-gpu: move fields to struct VirtIOGPUGL Gerd Hoffmann
2021-05-10 13:20 ` [PULL 23/25] virtio-gpu: add virtio-gpu-gl-pci Gerd Hoffmann
2021-05-10 13:20 ` [PULL 24/25] modules: add have_vga Gerd Hoffmann
2021-05-10 13:20 ` Gerd Hoffmann [this message]
2021-05-10 13:43 ` [PULL 00/25] Vga 20210510 patches no-reply
2021-05-12 15:05 ` Peter Maydell
2021-06-30 18:16 ` Marc-André Lureau
2021-07-01 6:29 ` Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510132051.2208563-26-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).