From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
To: "Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Huang Rui" <ray.huang@amd.com>,
"Marc-André Lureau" <marcandre.lureau@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony PERARD" <anthony.perard@citrix.com>,
"Antonio Caggiano" <quic_acaggian@quicinc.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Robert Beckett" <bob.beckett@collabora.com>,
"Gert Wollny" <gert.wollny@collabora.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
ernunes@redhat.com, "Alyssa Ross" <hi@alyssa.is>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Stefano Stabellini" <stefano.stabellini@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Xenia Ragiadakou" <xenia.ragiadakou@amd.com>,
"Pierre-Eric Pelloux-Prayer" <pierre-eric.pelloux-prayer@amd.com>,
"Honglei Huang" <honglei1.huang@amd.com>,
"Julia Zhang" <julia.zhang@amd.com>,
"Chen Jiqian" <Jiqian.Chen@amd.com>,
"Yiwei Zhang" <zzyiwei@chromium.org>
Subject: [PATCH v8 10/11] virtio-gpu: Register capsets dynamically
Date: Thu, 18 Apr 2024 22:00:39 +0300 [thread overview]
Message-ID: <20240418190040.1110210-11-dmitry.osipenko@collabora.com> (raw)
In-Reply-To: <20240418190040.1110210-1-dmitry.osipenko@collabora.com>
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
virtio_gpu_virgl_get_num_capsets will return "num_capsets", but we can't
assume that capset_index 1 is always VIRGL2 once we'll support more capsets,
like Venus and DRM capsets. Register capsets dynamically to avoid that problem.
Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
hw/display/virtio-gpu-virgl.c | 37 ++++++++++++++++++++++------------
include/hw/virtio/virtio-gpu.h | 3 +++
2 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
index eee3816b987f..c0e1ca3ff339 100644
--- a/hw/display/virtio-gpu-virgl.c
+++ b/hw/display/virtio-gpu-virgl.c
@@ -558,19 +558,12 @@ static void virgl_cmd_get_capset_info(VirtIOGPU *g,
VIRTIO_GPU_FILL_CMD(info);
memset(&resp, 0, sizeof(resp));
- if (info.capset_index == 0) {
- resp.capset_id = VIRTIO_GPU_CAPSET_VIRGL;
- virgl_renderer_get_cap_set(resp.capset_id,
- &resp.capset_max_version,
- &resp.capset_max_size);
- } else if (info.capset_index == 1) {
- resp.capset_id = VIRTIO_GPU_CAPSET_VIRGL2;
+
+ if (info.capset_index < g->num_capsets) {
+ resp.capset_id = g->capset_ids[info.capset_index];
virgl_renderer_get_cap_set(resp.capset_id,
&resp.capset_max_version,
&resp.capset_max_size);
- } else {
- resp.capset_max_version = 0;
- resp.capset_max_size = 0;
}
resp.hdr.type = VIRTIO_GPU_RESP_OK_CAPSET_INFO;
virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp));
@@ -1120,12 +1113,30 @@ int virtio_gpu_virgl_init(VirtIOGPU *g)
return 0;
}
+static void virtio_gpu_virgl_add_capset(VirtIOGPU *g, uint32_t capset_id)
+{
+ g->capset_ids = g_realloc_n(g->capset_ids, g->num_capsets + 1,
+ sizeof(*g->capset_ids));
+ g->capset_ids[g->num_capsets++] = capset_id;
+}
+
int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g)
{
uint32_t capset2_max_ver, capset2_max_size;
+
+ if (g->num_capsets) {
+ return g->num_capsets;
+ }
+
+ /* VIRGL is always supported. */
+ virtio_gpu_virgl_add_capset(g, VIRTIO_GPU_CAPSET_VIRGL);
+
virgl_renderer_get_cap_set(VIRTIO_GPU_CAPSET_VIRGL2,
- &capset2_max_ver,
- &capset2_max_size);
+ &capset2_max_ver,
+ &capset2_max_size);
+ if (capset2_max_ver) {
+ virtio_gpu_virgl_add_capset(g, VIRTIO_GPU_CAPSET_VIRGL2);
+ }
- return capset2_max_ver ? 2 : 1;
+ return g->num_capsets;
}
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index d2a0d542fbb3..3d7d001a85c5 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -218,6 +218,9 @@ struct VirtIOGPU {
QTAILQ_HEAD(, VGPUDMABuf) bufs;
VGPUDMABuf *primary[VIRTIO_GPU_MAX_SCANOUTS];
} dmabuf;
+
+ uint32_t *capset_ids;
+ uint32_t num_capsets;
};
struct VirtIOGPUClass {
--
2.44.0
next prev parent reply other threads:[~2024-04-18 19:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 19:00 [PATCH v8 00/11] Support blob memory and venus on qemu Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 01/11] linux-headers: Update to Linux v6.9-rc3 Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 02/11] virtio-gpu: Use pkgconfig version to decide which virgl features are available Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 03/11] virtio-gpu: Support context-init feature with virglrenderer Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 04/11] virtio-gpu: Don't require udmabuf when blobs and virgl are enabled Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 05/11] virtio-gpu: Add virgl resource management Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 06/11] virtio-gpu: Support blob scanout using dmabuf fd Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 07/11] virtio-gpu: Support suspension of commands processing Dmitry Osipenko
2024-04-19 8:53 ` Akihiko Odaki
2024-04-24 9:43 ` Dmitry Osipenko
2024-04-27 5:48 ` Akihiko Odaki
2024-05-01 19:02 ` Dmitry Osipenko
2024-05-05 6:37 ` Akihiko Odaki
2024-04-18 19:00 ` [PATCH v8 08/11] virtio-gpu: Handle resource blob commands Dmitry Osipenko
2024-04-19 9:18 ` Akihiko Odaki
2024-04-24 10:30 ` Dmitry Osipenko
2024-04-27 5:52 ` Akihiko Odaki
2024-05-01 19:20 ` Dmitry Osipenko
2024-05-05 6:47 ` Akihiko Odaki
2024-04-18 19:00 ` [PATCH v8 09/11] virtio-gpu: Resource UUID Dmitry Osipenko
2024-04-19 9:29 ` Akihiko Odaki
2024-04-23 17:43 ` Dmitry Osipenko
2024-04-24 12:52 ` Dmitry Osipenko
2024-04-18 19:00 ` Dmitry Osipenko [this message]
2024-04-19 9:35 ` [PATCH v8 10/11] virtio-gpu: Register capsets dynamically Akihiko Odaki
2024-04-18 19:00 ` [PATCH v8 11/11] virtio-gpu: Support Venus context Dmitry Osipenko
2024-04-19 9:44 ` Akihiko Odaki
2024-04-23 8:30 ` [PATCH v8 00/11] Support blob memory and venus on qemu Alex Bennée
2024-04-23 17:37 ` Dmitry Osipenko
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=20240418190040.1110210-11-dmitry.osipenko@collabora.com \
--to=dmitry.osipenko@collabora.com \
--cc=Jiqian.Chen@amd.com \
--cc=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=alexander.deucher@amd.com \
--cc=anthony.perard@citrix.com \
--cc=bob.beckett@collabora.com \
--cc=christian.koenig@amd.com \
--cc=dgilbert@redhat.com \
--cc=ernunes@redhat.com \
--cc=gert.wollny@collabora.com \
--cc=gurchetansingh@chromium.org \
--cc=hi@alyssa.is \
--cc=honglei1.huang@amd.com \
--cc=julia.zhang@amd.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=mst@redhat.com \
--cc=philmd@linaro.org \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=qemu-devel@nongnu.org \
--cc=quic_acaggian@quicinc.com \
--cc=ray.huang@amd.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=stefano.stabellini@amd.com \
--cc=xenia.ragiadakou@amd.com \
--cc=zzyiwei@chromium.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.