[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/16] virtio-gpu: move virtio-gpu-gl-device to separate modul
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 11/16] virtio-gpu: move virtio-gpu-gl-device to separate module |
Date: |
Fri, 30 Apr 2021 13:35:42 +0200 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
util/module.c | 4 +++-
hw/display/meson.build | 9 ++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/util/module.c b/util/module.c
index 47bba1182841..c8f3e5a0a736 100644
--- a/util/module.c
+++ b/util/module.c
@@ -182,6 +182,8 @@ static const struct {
{ "ui-spice-app", "ui-spice-core" },
{ "ui-spice-app", "chardev-spice" },
+ { "hw-display-virtio-gpu-gl", "hw-display-virtio-gpu" },
+
#ifdef CONFIG_OPENGL
{ "ui-egl-headless", "ui-opengl" },
{ "ui-gtk", "ui-opengl" },
@@ -301,7 +303,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" },
+ { "virtio-gpu-gl-device", "hw-", "display-virtio-gpu-gl" },
{ "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 5161efa08a6e..3c3e47c47ed1 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -56,11 +56,14 @@ softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true:
files('ati.c', 'ati_2d
if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
virtio_gpu_ss = ss.source_set()
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-gl.c', 'virtio-gpu-virgl.c'),
pixman, virgl])
+ if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'),
pixman])
virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true:
files('vhost-user-gpu.c'))
hw_display_modules += {'virtio-gpu': virtio_gpu_ss}
+
+ virtio_gpu_gl_ss = ss.source_set()
+ virtio_gpu_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL', opengl],
+ if_true: [files('virtio-gpu-gl.c',
'virtio-gpu-virgl.c'), pixman, virgl])
+ hw_display_modules += {'virtio-gpu-gl': virtio_gpu_gl_ss}
endif
if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
--
2.30.2
- [PATCH v2 03/16] virtio-gpu: move virgl realize + properties, (continued)
- [PATCH v2 03/16] virtio-gpu: move virgl realize + properties, Gerd Hoffmann, 2021/04/30
- [PATCH v2 05/16] virtio-gpu: use class function for ctrl queue handlers, Gerd Hoffmann, 2021/04/30
- [PATCH v2 02/16] virtio-gpu: add virtio-gpu-gl-device, Gerd Hoffmann, 2021/04/30
- [PATCH v2 06/16] virtio-gpu: move virgl handle_ctrl, Gerd Hoffmann, 2021/04/30
- [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 <=
- [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, 2021/04/30
- 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