From: Gurchetan Singh <gurchetansingh@chromium.org>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com,
dmitry.osipenko@collabora.com, ray.huang@amd.com,
alex.bennee@linaro.org, ernunes@redhat.com, hi@alyssa.is,
shentey@gmail.com
Subject: [PATCH v5 5/9] gfxstream + rutabaga prep: added need defintions, fields, and options
Date: Mon, 14 Aug 2023 17:35:22 -0700 [thread overview]
Message-ID: <20230815003526.631-6-gurchetansingh@chromium.org> (raw)
In-Reply-To: <20230815003526.631-1-gurchetansingh@chromium.org>
This modifies the common virtio-gpu.h file have the fields and
defintions needed by gfxstream/rutabaga, by VirtioGpuRutabaga.
The command to run these would be:
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Alyssa Ross <hi@alyssa.is>
---
-device virtio-vga-rutabaga,capset_names=gfxstream-vulkan:cross-domain, \
wayland_socket_path=/run/user/1000/wayland-0,hostmem=8G \
v1: void *rutabaga --> struct rutabaga *rutabaga (Akihiko)
have a separate rutabaga device instead of using GL device (Bernard)
v2: VirtioGpuRutabaga --> VirtIOGPURutabaga (Akihiko)
move MemoryRegionInfo into VirtIOGPURutabaga (Akihiko)
remove 'ctx' field (Akihiko)
remove 'rutabaga_active'
include/hw/virtio/virtio-gpu.h | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 55973e112f..e2a07e68d9 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -38,6 +38,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPUGL, VIRTIO_GPU_GL)
#define TYPE_VHOST_USER_GPU "vhost-user-gpu"
OBJECT_DECLARE_SIMPLE_TYPE(VhostUserGPU, VHOST_USER_GPU)
+#define TYPE_VIRTIO_GPU_RUTABAGA "virtio-gpu-rutabaga-device"
+OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPURutabaga, VIRTIO_GPU_RUTABAGA)
+
struct virtio_gpu_simple_resource {
uint32_t resource_id;
uint32_t width;
@@ -94,6 +97,7 @@ enum virtio_gpu_base_conf_flags {
VIRTIO_GPU_FLAG_DMABUF_ENABLED,
VIRTIO_GPU_FLAG_BLOB_ENABLED,
VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED,
+ VIRTIO_GPU_FLAG_RUTABAGA_ENABLED,
};
#define virtio_gpu_virgl_enabled(_cfg) \
@@ -108,6 +112,8 @@ enum virtio_gpu_base_conf_flags {
(_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED))
#define virtio_gpu_context_init_enabled(_cfg) \
(_cfg.flags & (1 << VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED))
+#define virtio_gpu_rutabaga_enabled(_cfg) \
+ (_cfg.flags & (1 << VIRTIO_GPU_FLAG_RUTABAGA_ENABLED))
#define virtio_gpu_hostmem_enabled(_cfg) \
(_cfg.hostmem > 0)
@@ -232,6 +238,28 @@ struct VhostUserGPU {
bool backend_blocked;
};
+#define MAX_SLOTS 4096
+
+struct MemoryRegionInfo {
+ int used;
+ MemoryRegion mr;
+ uint32_t resource_id;
+};
+
+struct rutabaga;
+
+struct VirtIOGPURutabaga {
+ struct VirtIOGPU parent_obj;
+
+ struct MemoryRegionInfo memory_regions[MAX_SLOTS];
+ char *capset_names;
+ char *wayland_socket_path;
+ char *wsi;
+ bool headless;
+ uint32_t num_capsets;
+ struct rutabaga *rutabaga;
+};
+
#define VIRTIO_GPU_FILL_CMD(out) do { \
size_t s; \
s = iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \
--
2.41.0.694.ge786442a9b-goog
next prev parent reply other threads:[~2023-08-15 0:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 0:35 [PATCH v5 0/9] gfxstream + rutabaga_gfx Gurchetan Singh
2023-08-15 0:35 ` [PATCH v5 1/9] virtio: Add shared memory capability Gurchetan Singh
2023-08-15 0:35 ` [PATCH v5 2/9] virtio-gpu: CONTEXT_INIT feature Gurchetan Singh
2023-08-15 0:35 ` [PATCH v5 3/9] virtio-gpu: hostmem Gurchetan Singh
2023-08-15 14:11 ` Manos Pitsidianakis
2023-08-15 0:35 ` [PATCH v5 4/9] virtio-gpu: blob prep Gurchetan Singh
2023-08-15 14:17 ` Manos Pitsidianakis
2023-08-15 0:35 ` Gurchetan Singh [this message]
2023-08-15 14:31 ` [PATCH v5 5/9] gfxstream + rutabaga prep: added need defintions, fields, and options Manos Pitsidianakis
2023-08-15 0:35 ` [PATCH v5 6/9] gfxstream + rutabaga: add initial support for gfxstream Gurchetan Singh
2023-08-15 14:40 ` Manos Pitsidianakis
2023-08-15 15:07 ` Akihiko Odaki
2023-08-15 15:50 ` Gurchetan Singh
2023-08-16 15:15 ` Akihiko Odaki
2023-08-15 0:35 ` [PATCH v5 7/9] gfxstream + rutabaga: meson support Gurchetan Singh
2023-08-15 15:03 ` Manos Pitsidianakis
2023-08-15 0:35 ` [PATCH v5 8/9] gfxstream + rutabaga: enable rutabaga Gurchetan Singh
2023-08-15 15:06 ` Manos Pitsidianakis
2023-08-15 0:35 ` [PATCH v5 9/9] docs/system: add basic virtio-gpu documentation Gurchetan Singh
2023-08-15 15:06 ` Manos Pitsidianakis
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=20230815003526.631-6-gurchetansingh@chromium.org \
--to=gurchetansingh@chromium.org \
--cc=akihiko.odaki@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=dmitry.osipenko@collabora.com \
--cc=ernunes@redhat.com \
--cc=hi@alyssa.is \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=ray.huang@amd.com \
--cc=shentey@gmail.com \
/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).