* [PATCH 0/5] virtio-gpu: Blob resources
@ 2022-08-29 15:40 Antonio Caggiano
2022-08-29 15:40 ` [PATCH 1/5] Update version for v7.1.0-rc4 release Antonio Caggiano
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Antonio Caggiano @ 2022-08-29 15:40 UTC (permalink / raw)
To: qemu-devel; +Cc: gert.wollny, dmitry.osipenko
Add shared memory and support blob resource creation, mapping and
unmapping through virglrenderer new stable APIs[0] when available.
[0] https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/891
Antonio Caggiano (1):
virtio-gpu: Handle resource blob commands
Dmitry Osipenko (1):
virtio-gpu: Don't require udmabuf when blob support is enabled
Dr. David Alan Gilbert (1):
virtio: Add shared memory capability
Gerd Hoffmann (1):
virtio-gpu: hostmem
Richard Henderson (1):
Update version for v7.1.0-rc4 release
VERSION | 2 +-
hw/display/virtio-gpu-pci.c | 15 +++
hw/display/virtio-gpu-virgl.c | 169 +++++++++++++++++++++++++++
hw/display/virtio-gpu.c | 25 ++--
hw/display/virtio-vga.c | 33 ++++--
hw/virtio/virtio-pci.c | 18 +++
include/hw/virtio/virtio-gpu-bswap.h | 18 +++
include/hw/virtio/virtio-gpu.h | 11 ++
include/hw/virtio/virtio-pci.h | 4 +
meson.build | 5 +
10 files changed, 276 insertions(+), 24 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/5] Update version for v7.1.0-rc4 release
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
@ 2022-08-29 15:40 ` Antonio Caggiano
2022-08-29 21:52 ` Dmitry Osipenko
2022-08-29 15:40 ` [PATCH 2/5] virtio: Add shared memory capability Antonio Caggiano
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Antonio Caggiano @ 2022-08-29 15:40 UTC (permalink / raw)
To: qemu-devel; +Cc: gert.wollny, dmitry.osipenko, Richard Henderson
From: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION b/VERSION
index 1c944b9863..b8d5f3ebb6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.93
+7.0.94
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/5] virtio: Add shared memory capability
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
2022-08-29 15:40 ` [PATCH 1/5] Update version for v7.1.0-rc4 release Antonio Caggiano
@ 2022-08-29 15:40 ` Antonio Caggiano
2022-08-29 15:40 ` [PATCH 3/5] virtio-gpu: hostmem Antonio Caggiano
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Antonio Caggiano @ 2022-08-29 15:40 UTC (permalink / raw)
To: qemu-devel
Cc: gert.wollny, dmitry.osipenko, Dr. David Alan Gilbert,
Michael S. Tsirkin
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Define a new capability type 'VIRTIO_PCI_CAP_SHARED_MEMORY_CFG'
and the data structure 'virtio_pci_shm_cap' to go with it.
They allow defining shared memory regions with sizes and offsets
of 2^32 and more.
Multiple instances of the capability are allowed and distinguished
by a device-specific 'id'.
v2: Remove virtio_pci_shm_cap as virtio_pci_cap64 is used instead.
v3: No need for mask32 as cpu_to_le32 truncates the value.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
---
hw/virtio/virtio-pci.c | 18 ++++++++++++++++++
include/hw/virtio/virtio-pci.h | 4 ++++
2 files changed, 22 insertions(+)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index a50c5a57d7..377bb06fec 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1169,6 +1169,24 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
return offset;
}
+int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
+ uint8_t bar, uint64_t offset, uint64_t length,
+ uint8_t id)
+{
+ struct virtio_pci_cap64 cap = {
+ .cap.cap_len = sizeof cap,
+ .cap.cfg_type = VIRTIO_PCI_CAP_SHARED_MEMORY_CFG,
+ };
+
+ cap.cap.bar = bar;
+ cap.cap.length = cpu_to_le32(length);
+ cap.length_hi = cpu_to_le32(length >> 32);
+ cap.cap.offset = cpu_to_le32(offset);
+ cap.offset_hi = cpu_to_le32(offset >> 32);
+ cap.cap.id = id;
+ return virtio_pci_add_mem_cap(proxy, &cap.cap);
+}
+
static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
unsigned size)
{
diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h
index 2446dcd9ae..5e5c4a4c6d 100644
--- a/include/hw/virtio/virtio-pci.h
+++ b/include/hw/virtio/virtio-pci.h
@@ -252,4 +252,8 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t);
*/
unsigned virtio_pci_optimal_num_queues(unsigned fixed_queues);
+int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
+ uint8_t bar, uint64_t offset, uint64_t length,
+ uint8_t id);
+
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/5] virtio-gpu: hostmem
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
2022-08-29 15:40 ` [PATCH 1/5] Update version for v7.1.0-rc4 release Antonio Caggiano
2022-08-29 15:40 ` [PATCH 2/5] virtio: Add shared memory capability Antonio Caggiano
@ 2022-08-29 15:40 ` Antonio Caggiano
2022-08-29 15:40 ` [PATCH 4/5] virtio-gpu: Handle resource blob commands Antonio Caggiano
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Antonio Caggiano @ 2022-08-29 15:40 UTC (permalink / raw)
To: qemu-devel
Cc: gert.wollny, dmitry.osipenko, Gerd Hoffmann, Michael S . Tsirkin
From: Gerd Hoffmann <kraxel@redhat.com>
Use VIRTIO_GPU_SHM_ID_HOST_VISIBLE as id for virtio-gpu.
v2: Formatting fixes
Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/display/virtio-gpu-pci.c | 15 +++++++++++++++
hw/display/virtio-gpu.c | 1 +
hw/display/virtio-vga.c | 33 ++++++++++++++++++++++++---------
include/hw/virtio/virtio-gpu.h | 5 +++++
4 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index 93f214ff58..2cbbacd7fe 100644
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -33,6 +33,21 @@ static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
DeviceState *vdev = DEVICE(g);
int i;
+ if (virtio_gpu_hostmem_enabled(g->conf)) {
+ vpci_dev->msix_bar_idx = 1;
+ vpci_dev->modern_mem_bar_idx = 2;
+ memory_region_init(&g->hostmem, OBJECT(g), "virtio-gpu-hostmem",
+ g->conf.hostmem);
+ pci_register_bar(&vpci_dev->pci_dev, 4,
+ PCI_BASE_ADDRESS_SPACE_MEMORY |
+ PCI_BASE_ADDRESS_MEM_PREFETCH |
+ PCI_BASE_ADDRESS_MEM_TYPE_64,
+ &g->hostmem);
+ virtio_pci_add_shm_cap(vpci_dev, 4, 0, g->conf.hostmem,
+ VIRTIO_GPU_SHM_ID_HOST_VISIBLE);
+ }
+
+ qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus), errp);
virtio_pci_force_virtio_1(vpci_dev);
if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {
return;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 20cc703dcc..506b3b8eef 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1424,6 +1424,7 @@ static Property virtio_gpu_properties[] = {
256 * MiB),
DEFINE_PROP_BIT("blob", VirtIOGPU, parent_obj.conf.flags,
VIRTIO_GPU_FLAG_BLOB_ENABLED, false),
+ DEFINE_PROP_SIZE("hostmem", VirtIOGPU, parent_obj.conf.hostmem, 0),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 4dcb34c4a7..aa8d1ab993 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -115,17 +115,32 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
pci_register_bar(&vpci_dev->pci_dev, 0,
PCI_BASE_ADDRESS_MEM_PREFETCH, &vga->vram);
- /*
- * Configure virtio bar and regions
- *
- * We use bar #2 for the mmio regions, to be compatible with stdvga.
- * virtio regions are moved to the end of bar #2, to make room for
- * the stdvga mmio registers at the start of bar #2.
- */
- vpci_dev->modern_mem_bar_idx = 2;
- vpci_dev->msix_bar_idx = 4;
vpci_dev->modern_io_bar_idx = 5;
+ if (!virtio_gpu_hostmem_enabled(g->conf)) {
+ /*
+ * Configure virtio bar and regions
+ *
+ * We use bar #2 for the mmio regions, to be compatible with stdvga.
+ * virtio regions are moved to the end of bar #2, to make room for
+ * the stdvga mmio registers at the start of bar #2.
+ */
+ vpci_dev->modern_mem_bar_idx = 2;
+ vpci_dev->msix_bar_idx = 4;
+ } else {
+ vpci_dev->msix_bar_idx = 1;
+ vpci_dev->modern_mem_bar_idx = 2;
+ memory_region_init(&g->hostmem, OBJECT(g), "virtio-gpu-hostmem",
+ g->conf.hostmem);
+ pci_register_bar(&vpci_dev->pci_dev, 4,
+ PCI_BASE_ADDRESS_SPACE_MEMORY |
+ PCI_BASE_ADDRESS_MEM_PREFETCH |
+ PCI_BASE_ADDRESS_MEM_TYPE_64,
+ &g->hostmem);
+ virtio_pci_add_shm_cap(vpci_dev, 4, 0, g->conf.hostmem,
+ VIRTIO_GPU_SHM_ID_HOST_VISIBLE);
+ }
+
if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) {
/*
* with page-per-vq=off there is no padding space we can use
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 2e28507efe..eafce75b04 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -102,12 +102,15 @@ enum virtio_gpu_base_conf_flags {
(_cfg.flags & (1 << VIRTIO_GPU_FLAG_DMABUF_ENABLED))
#define virtio_gpu_blob_enabled(_cfg) \
(_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED))
+#define virtio_gpu_hostmem_enabled(_cfg) \
+ (_cfg.hostmem > 0)
struct virtio_gpu_base_conf {
uint32_t max_outputs;
uint32_t flags;
uint32_t xres;
uint32_t yres;
+ uint64_t hostmem;
};
struct virtio_gpu_ctrl_command {
@@ -131,6 +134,8 @@ struct VirtIOGPUBase {
int renderer_blocked;
int enable;
+ MemoryRegion hostmem;
+
struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUTS];
int enabled_output_bitmask;
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/5] virtio-gpu: Handle resource blob commands
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
` (2 preceding siblings ...)
2022-08-29 15:40 ` [PATCH 3/5] virtio-gpu: hostmem Antonio Caggiano
@ 2022-08-29 15:40 ` Antonio Caggiano
2022-08-30 10:55 ` Marc-André Lureau
2022-08-29 15:40 ` [PATCH 5/5] virtio-gpu: Don't require udmabuf when blob support is enabled Antonio Caggiano
2022-08-30 11:07 ` [PATCH 0/5] virtio-gpu: Blob resources Marc-André Lureau
5 siblings, 1 reply; 11+ messages in thread
From: Antonio Caggiano @ 2022-08-29 15:40 UTC (permalink / raw)
To: qemu-devel
Cc: gert.wollny, dmitry.osipenko, Gerd Hoffmann, Michael S. Tsirkin
Support BLOB resources creation by calling virgl_renderer_resource_create_blob.
Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
hw/display/virtio-gpu-virgl.c | 169 +++++++++++++++++++++++++++
hw/display/virtio-gpu.c | 8 +-
include/hw/virtio/virtio-gpu-bswap.h | 18 +++
include/hw/virtio/virtio-gpu.h | 6 +
meson.build | 5 +
5 files changed, 202 insertions(+), 4 deletions(-)
diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
index 73cb92c8d5..c4c2c31d76 100644
--- a/hw/display/virtio-gpu-virgl.c
+++ b/hw/display/virtio-gpu-virgl.c
@@ -16,6 +16,8 @@
#include "trace.h"
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-gpu.h"
+#include "hw/virtio/virtio-gpu-bswap.h"
+#include "hw/virtio/virtio-iommu.h"
#include <virglrenderer.h>
@@ -398,6 +400,162 @@ static void virgl_cmd_get_capset(VirtIOGPU *g,
g_free(resp);
}
+#ifdef HAVE_VIRGL_RESOURCE_BLOB
+
+static void virgl_cmd_resource_create_blob(VirtIOGPU *g,
+ struct virtio_gpu_ctrl_command *cmd)
+{
+ struct virtio_gpu_simple_resource *res;
+ struct virtio_gpu_resource_create_blob cblob;
+ int ret;
+
+ VIRTIO_GPU_FILL_CMD(cblob);
+ virtio_gpu_create_blob_bswap(&cblob);
+ trace_virtio_gpu_cmd_res_create_blob(cblob.resource_id, cblob.size);
+
+ if (cblob.resource_id == 0) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not allowed\n",
+ __func__);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ res = virtio_gpu_find_resource(g, cblob.resource_id);
+ if (res) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already exists %d\n",
+ __func__, cblob.resource_id);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ res = g_new0(struct virtio_gpu_simple_resource, 1);
+ res->resource_id = cblob.resource_id;
+ res->blob_size = cblob.size;
+
+ if (res->iov) {
+ cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
+ return;
+ }
+
+ if (cblob.blob_mem != VIRTIO_GPU_BLOB_MEM_HOST3D) {
+ ret = virtio_gpu_create_mapping_iov(g, cblob.nr_entries, sizeof(cblob),
+ cmd, &res->addrs, &res->iov,
+ &res->iov_cnt);
+ if (ret != 0) {
+ cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
+ return;
+ }
+ }
+
+ if (cblob.blob_mem == VIRTIO_GPU_BLOB_MEM_GUEST) {
+ virtio_gpu_init_udmabuf(res);
+ }
+ QTAILQ_INSERT_HEAD(&g->reslist, res, next);
+
+ const struct virgl_renderer_resource_create_blob_args virgl_args = {
+ .res_handle = cblob.resource_id,
+ .ctx_id = cblob.hdr.ctx_id,
+ .blob_mem = cblob.blob_mem,
+ .blob_id = cblob.blob_id,
+ .blob_flags = cblob.blob_flags,
+ .size = cblob.size,
+ .iovecs = res->iov,
+ .num_iovs = res->iov_cnt,
+ };
+ ret = virgl_renderer_resource_create_blob(&virgl_args);
+ if (ret) {
+ g_print("Virgl blob create error: %s\n", strerror(-ret));
+ }
+}
+
+static void virgl_cmd_resource_map_blob(VirtIOGPU *g,
+ struct virtio_gpu_ctrl_command *cmd)
+{
+ struct virtio_gpu_simple_resource *res;
+ struct virtio_gpu_resource_map_blob mblob;
+ int ret;
+ void *data;
+ uint64_t size;
+ struct virtio_gpu_resp_map_info resp;
+
+ VIRTIO_GPU_FILL_CMD(mblob);
+ virtio_gpu_map_blob_bswap(&mblob);
+
+ if (mblob.resource_id == 0) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not allowed\n",
+ __func__);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ res = virtio_gpu_find_resource(g, mblob.resource_id);
+ if (!res) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n",
+ __func__, mblob.resource_id);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ ret = virgl_renderer_resource_map(res->resource_id, &data, &size);
+ if (ret) {
+ g_print("Virgl blob resource map error: %s\n", strerror(-ret));
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ memory_region_init_ram_device_ptr(&res->region, OBJECT(g), NULL, size, data);
+ memory_region_add_subregion(&g->parent_obj.hostmem, mblob.offset, &res->region);
+ memory_region_set_enabled(&res->region, true);
+
+ memset(&resp, 0, sizeof(resp));
+ resp.hdr.type = VIRTIO_GPU_RESP_OK_MAP_INFO;
+ virgl_renderer_resource_get_map_info(mblob.resource_id, &resp.map_info);
+ virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp));
+
+ res->mapped = true;
+}
+
+static void virgl_cmd_resource_unmap_blob(VirtIOGPU *g,
+ struct virtio_gpu_ctrl_command *cmd)
+{
+ struct virtio_gpu_simple_resource *res;
+ struct virtio_gpu_resource_unmap_blob ublob;
+ VIRTIO_GPU_FILL_CMD(ublob);
+ virtio_gpu_unmap_blob_bswap(&ublob);
+
+ if (ublob.resource_id == 0) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not allowed\n",
+ __func__);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ res = virtio_gpu_find_resource(g, ublob.resource_id);
+ if (!res) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n",
+ __func__, ublob.resource_id);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ if (!res->mapped) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already unmapped %d\n",
+ __func__, ublob.resource_id);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ memory_region_set_enabled(&res->region, false);
+ memory_region_del_subregion(&g->parent_obj.hostmem, &res->region);
+ object_unparent(OBJECT(&res->region));
+
+ virgl_renderer_resource_unmap(ublob.resource_id);
+
+ res->mapped = false;
+}
+
+#endif /* HAVE_VIRGL_RESOURCE_BLOB */
+
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd)
{
@@ -464,6 +622,17 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
case VIRTIO_GPU_CMD_GET_EDID:
virtio_gpu_get_edid(g, cmd);
break;
+#ifdef HAVE_VIRGL_RESOURCE_BLOB
+ case VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB:
+ virgl_cmd_resource_create_blob(g, cmd);
+ break;
+ case VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB:
+ virgl_cmd_resource_map_blob(g, cmd);
+ break;
+ case VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB:
+ virgl_cmd_resource_unmap_blob(g, cmd);
+ break;
+#endif /* HAVE_VIRGL_RESOURCE_BLOB */
default:
cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
break;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 506b3b8eef..527c0aeede 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -33,8 +33,6 @@
#define VIRTIO_GPU_VM_VERSION 1
-static struct virtio_gpu_simple_resource*
-virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
static struct virtio_gpu_simple_resource *
virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t resource_id,
bool require_backing,
@@ -115,7 +113,7 @@ static void update_cursor(VirtIOGPU *g, struct virtio_gpu_update_cursor *cursor)
cursor->resource_id ? 1 : 0);
}
-static struct virtio_gpu_simple_resource *
+struct virtio_gpu_simple_resource *
virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id)
{
struct virtio_gpu_simple_resource *res;
@@ -1323,10 +1321,12 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
return;
}
+#ifndef HAVE_VIRGL_RESOURCE_BLOB
if (virtio_gpu_virgl_enabled(g->parent_obj.conf)) {
- error_setg(errp, "blobs and virgl are not compatible (yet)");
+ error_setg(errp, "Linked virglrenderer does not support blob resources");
return;
}
+#endif
}
if (!virtio_gpu_base_device_realize(qdev,
diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virtio-gpu-bswap.h
index 9124108485..dd1975e2d4 100644
--- a/include/hw/virtio/virtio-gpu-bswap.h
+++ b/include/hw/virtio/virtio-gpu-bswap.h
@@ -63,10 +63,28 @@ virtio_gpu_create_blob_bswap(struct virtio_gpu_resource_create_blob *cblob)
{
virtio_gpu_ctrl_hdr_bswap(&cblob->hdr);
le32_to_cpus(&cblob->resource_id);
+ le32_to_cpus(&cblob->blob_mem);
le32_to_cpus(&cblob->blob_flags);
+ le32_to_cpus(&cblob->nr_entries);
+ le64_to_cpus(&cblob->blob_id);
le64_to_cpus(&cblob->size);
}
+static inline void
+virtio_gpu_map_blob_bswap(struct virtio_gpu_resource_map_blob *mblob)
+{
+ virtio_gpu_ctrl_hdr_bswap(&mblob->hdr);
+ le32_to_cpus(&mblob->resource_id);
+ le64_to_cpus(&mblob->offset);
+}
+
+static inline void
+virtio_gpu_unmap_blob_bswap(struct virtio_gpu_resource_unmap_blob *ublob)
+{
+ virtio_gpu_ctrl_hdr_bswap(&ublob->hdr);
+ le32_to_cpus(&ublob->resource_id);
+}
+
static inline void
virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb)
{
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index eafce75b04..4f4cabf3b3 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -55,6 +55,9 @@ struct virtio_gpu_simple_resource {
int dmabuf_fd;
uint8_t *remapped;
+ MemoryRegion region;
+ bool mapped;
+
QTAILQ_ENTRY(virtio_gpu_simple_resource) next;
};
@@ -245,6 +248,9 @@ void virtio_gpu_base_fill_display_info(VirtIOGPUBase *g,
struct virtio_gpu_resp_display_info *dpy_info);
/* virtio-gpu.c */
+struct virtio_gpu_simple_resource *
+virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
+
void virtio_gpu_ctrl_response(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd,
struct virtio_gpu_ctrl_hdr *resp,
diff --git a/meson.build b/meson.build
index 20fddbd707..058fe03fd7 100644
--- a/meson.build
+++ b/meson.build
@@ -718,6 +718,11 @@ if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu
method: 'pkg-config',
required: get_option('virglrenderer'),
kwargs: static_kwargs)
+
+ config_host_data.set('HAVE_VIRGL_RESOURCE_BLOB',
+ cc.has_function('virgl_renderer_resource_create_blob',
+ prefix: '#include <virglrenderer.h>',
+ dependencies: virgl))
endif
curl = not_found
if not get_option('curl').auto() or have_block
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/5] virtio-gpu: Don't require udmabuf when blob support is enabled
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
` (3 preceding siblings ...)
2022-08-29 15:40 ` [PATCH 4/5] virtio-gpu: Handle resource blob commands Antonio Caggiano
@ 2022-08-29 15:40 ` Antonio Caggiano
2022-08-30 11:07 ` [PATCH 0/5] virtio-gpu: Blob resources Marc-André Lureau
5 siblings, 0 replies; 11+ messages in thread
From: Antonio Caggiano @ 2022-08-29 15:40 UTC (permalink / raw)
To: qemu-devel
Cc: gert.wollny, dmitry.osipenko, Gerd Hoffmann, Michael S. Tsirkin
From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Host blobs don't need udmabuf, it's only needed by guest blobs. The host
blobs are utilized by the Mesa virgl driver when persistent memory mapping
is needed by a GL buffer, otherwise virgl driver doesn't use blobs.
Persistent mapping support bumps GL version from 4.3 to 4.5 in guest.
Relax the udmabuf requirement.
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: Antonio Caggiano <antonio.caggiano@collabora.com>
---
hw/display/virtio-gpu.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 527c0aeede..4c2a9b7ea7 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -367,7 +367,9 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU *g,
return;
}
- virtio_gpu_init_udmabuf(res);
+ if (cblob.blob_mem == VIRTIO_GPU_BLOB_MEM_GUEST) {
+ virtio_gpu_init_udmabuf(res);
+ }
QTAILQ_INSERT_HEAD(&g->reslist, res, next);
}
@@ -1315,19 +1317,13 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
VirtIOGPU *g = VIRTIO_GPU(qdev);
- if (virtio_gpu_blob_enabled(g->parent_obj.conf)) {
- if (!virtio_gpu_have_udmabuf()) {
- error_setg(errp, "cannot enable blob resources without udmabuf");
- return;
- }
-
#ifndef HAVE_VIRGL_RESOURCE_BLOB
- if (virtio_gpu_virgl_enabled(g->parent_obj.conf)) {
- error_setg(errp, "Linked virglrenderer does not support blob resources");
- return;
- }
-#endif
+ if (virtio_gpu_blob_enabled(g->parent_obj.conf) &&
+ virtio_gpu_virgl_enabled(g->parent_obj.conf)) {
+ error_setg(errp, "Linked virglrenderer does not support blob resources");
+ return;
}
+#endif
if (!virtio_gpu_base_device_realize(qdev,
virtio_gpu_handle_ctrl_cb,
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/5] Update version for v7.1.0-rc4 release
2022-08-29 15:40 ` [PATCH 1/5] Update version for v7.1.0-rc4 release Antonio Caggiano
@ 2022-08-29 21:52 ` Dmitry Osipenko
0 siblings, 0 replies; 11+ messages in thread
From: Dmitry Osipenko @ 2022-08-29 21:52 UTC (permalink / raw)
To: Antonio Caggiano, qemu-devel; +Cc: gert.wollny, Richard Henderson
On 8/29/22 18:40, Antonio Caggiano wrote:
> From: Richard Henderson <richard.henderson@linaro.org>
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> VERSION | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/VERSION b/VERSION
> index 1c944b9863..b8d5f3ebb6 100644
> --- a/VERSION
> +++ b/VERSION
> @@ -1 +1 @@
> -7.0.93
> +7.0.94
This patch shouldn't be here.
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/5] virtio-gpu: Handle resource blob commands
2022-08-29 15:40 ` [PATCH 4/5] virtio-gpu: Handle resource blob commands Antonio Caggiano
@ 2022-08-30 10:55 ` Marc-André Lureau
0 siblings, 0 replies; 11+ messages in thread
From: Marc-André Lureau @ 2022-08-30 10:55 UTC (permalink / raw)
To: Antonio Caggiano
Cc: qemu-devel, gert.wollny, dmitry.osipenko, Gerd Hoffmann,
Michael S. Tsirkin
[-- Attachment #1: Type: text/plain, Size: 12501 bytes --]
Hi
On Mon, Aug 29, 2022 at 7:44 PM Antonio Caggiano <
antonio.caggiano@collabora.com> wrote:
> Support BLOB resources creation by calling
> virgl_renderer_resource_create_blob.
>
> Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> ---
> hw/display/virtio-gpu-virgl.c | 169 +++++++++++++++++++++++++++
> hw/display/virtio-gpu.c | 8 +-
> include/hw/virtio/virtio-gpu-bswap.h | 18 +++
> include/hw/virtio/virtio-gpu.h | 6 +
> meson.build | 5 +
> 5 files changed, 202 insertions(+), 4 deletions(-)
>
> diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
> index 73cb92c8d5..c4c2c31d76 100644
> --- a/hw/display/virtio-gpu-virgl.c
> +++ b/hw/display/virtio-gpu-virgl.c
> @@ -16,6 +16,8 @@
> #include "trace.h"
> #include "hw/virtio/virtio.h"
> #include "hw/virtio/virtio-gpu.h"
> +#include "hw/virtio/virtio-gpu-bswap.h"
> +#include "hw/virtio/virtio-iommu.h"
>
> #include <virglrenderer.h>
>
> @@ -398,6 +400,162 @@ static void virgl_cmd_get_capset(VirtIOGPU *g,
> g_free(resp);
> }
>
> +#ifdef HAVE_VIRGL_RESOURCE_BLOB
> +
> +static void virgl_cmd_resource_create_blob(VirtIOGPU *g,
> + struct virtio_gpu_ctrl_command
> *cmd)
> +{
> + struct virtio_gpu_simple_resource *res;
> + struct virtio_gpu_resource_create_blob cblob;
> + int ret;
> +
> + VIRTIO_GPU_FILL_CMD(cblob);
> + virtio_gpu_create_blob_bswap(&cblob);
> + trace_virtio_gpu_cmd_res_create_blob(cblob.resource_id, cblob.size);
> +
> + if (cblob.resource_id == 0) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not
> allowed\n",
> + __func__);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + res = virtio_gpu_find_resource(g, cblob.resource_id);
> + if (res) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already exists %d\n",
> + __func__, cblob.resource_id);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + res = g_new0(struct virtio_gpu_simple_resource, 1);
> + res->resource_id = cblob.resource_id;
> + res->blob_size = cblob.size;
> +
> + if (res->iov) {
> + cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
>
res is leaked
> + return;
> + }
> +
> + if (cblob.blob_mem != VIRTIO_GPU_BLOB_MEM_HOST3D) {
> + ret = virtio_gpu_create_mapping_iov(g, cblob.nr_entries,
> sizeof(cblob),
> + cmd, &res->addrs, &res->iov,
> + &res->iov_cnt);
> + if (ret != 0) {
> + cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
>
same
> + return;
> + }
> + }
> +
> + if (cblob.blob_mem == VIRTIO_GPU_BLOB_MEM_GUEST) {
> + virtio_gpu_init_udmabuf(res);
>
I wonder what happens when the command fails, but this is ignored by
virtio_gpu_resource_create_blob as well, ok.
> + }
> + QTAILQ_INSERT_HEAD(&g->reslist, res, next);
> +
> + const struct virgl_renderer_resource_create_blob_args virgl_args = {
> + .res_handle = cblob.resource_id,
> + .ctx_id = cblob.hdr.ctx_id,
> + .blob_mem = cblob.blob_mem,
> + .blob_id = cblob.blob_id,
> + .blob_flags = cblob.blob_flags,
> + .size = cblob.size,
> + .iovecs = res->iov,
> + .num_iovs = res->iov_cnt,
> + };
> + ret = virgl_renderer_resource_create_blob(&virgl_args);
> + if (ret) {
> + g_print("Virgl blob create error: %s\n", strerror(-ret));
>
why g_print? If not qemu_log_mask, then warn_report() perhaps?
> + }
> +}
> +
> +static void virgl_cmd_resource_map_blob(VirtIOGPU *g,
> + struct virtio_gpu_ctrl_command
> *cmd)
> +{
> + struct virtio_gpu_simple_resource *res;
> + struct virtio_gpu_resource_map_blob mblob;
> + int ret;
> + void *data;
> + uint64_t size;
> + struct virtio_gpu_resp_map_info resp;
> +
> + VIRTIO_GPU_FILL_CMD(mblob);
> + virtio_gpu_map_blob_bswap(&mblob);
> +
> + if (mblob.resource_id == 0) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not
> allowed\n",
> + __func__);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + res = virtio_gpu_find_resource(g, mblob.resource_id);
> + if (!res) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n",
> + __func__, mblob.resource_id);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + ret = virgl_renderer_resource_map(res->resource_id, &data, &size);
> + if (ret) {
> + g_print("Virgl blob resource map error: %s\n", strerror(-ret));
>
same about g_print
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + memory_region_init_ram_device_ptr(&res->region, OBJECT(g), NULL,
> size, data);
> + memory_region_add_subregion(&g->parent_obj.hostmem, mblob.offset,
> &res->region);
> + memory_region_set_enabled(&res->region, true);
> +
> + memset(&resp, 0, sizeof(resp));
> + resp.hdr.type = VIRTIO_GPU_RESP_OK_MAP_INFO;
> + virgl_renderer_resource_get_map_info(mblob.resource_id,
> &resp.map_info);
> + virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp));
> +
> + res->mapped = true;
> +}
> +
> +static void virgl_cmd_resource_unmap_blob(VirtIOGPU *g,
> + struct virtio_gpu_ctrl_command
> *cmd)
> +{
> + struct virtio_gpu_simple_resource *res;
> + struct virtio_gpu_resource_unmap_blob ublob;
> + VIRTIO_GPU_FILL_CMD(ublob);
> + virtio_gpu_unmap_blob_bswap(&ublob);
> +
> + if (ublob.resource_id == 0) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not
> allowed\n",
> + __func__);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + res = virtio_gpu_find_resource(g, ublob.resource_id);
> + if (!res) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n",
> + __func__, ublob.resource_id);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + if (!res->mapped) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already unmapped
> %d\n",
> + __func__, ublob.resource_id);
> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
> + return;
> + }
> +
> + memory_region_set_enabled(&res->region, false);
> + memory_region_del_subregion(&g->parent_obj.hostmem, &res->region);
> + object_unparent(OBJECT(&res->region));
> +
> + virgl_renderer_resource_unmap(ublob.resource_id);
>
Shouldn't the mapped resources be unmap during unrealize?
> +
> + res->mapped = false;
> +}
> +
> +#endif /* HAVE_VIRGL_RESOURCE_BLOB */
> +
> void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
> struct virtio_gpu_ctrl_command *cmd)
> {
> @@ -464,6 +622,17 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
> case VIRTIO_GPU_CMD_GET_EDID:
> virtio_gpu_get_edid(g, cmd);
> break;
> +#ifdef HAVE_VIRGL_RESOURCE_BLOB
> + case VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB:
> + virgl_cmd_resource_create_blob(g, cmd);
> + break;
> + case VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB:
> + virgl_cmd_resource_map_blob(g, cmd);
> + break;
> + case VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB:
> + virgl_cmd_resource_unmap_blob(g, cmd);
> + break;
> +#endif /* HAVE_VIRGL_RESOURCE_BLOB */
> default:
> cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
> break;
> diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
> index 506b3b8eef..527c0aeede 100644
> --- a/hw/display/virtio-gpu.c
> +++ b/hw/display/virtio-gpu.c
> @@ -33,8 +33,6 @@
>
> #define VIRTIO_GPU_VM_VERSION 1
>
> -static struct virtio_gpu_simple_resource*
> -virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
> static struct virtio_gpu_simple_resource *
> virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t resource_id,
> bool require_backing,
> @@ -115,7 +113,7 @@ static void update_cursor(VirtIOGPU *g, struct
> virtio_gpu_update_cursor *cursor)
> cursor->resource_id ? 1 : 0);
> }
>
> -static struct virtio_gpu_simple_resource *
> +struct virtio_gpu_simple_resource *
> virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id)
> {
> struct virtio_gpu_simple_resource *res;
> @@ -1323,10 +1321,12 @@ void virtio_gpu_device_realize(DeviceState *qdev,
> Error **errp)
> return;
> }
>
> +#ifndef HAVE_VIRGL_RESOURCE_BLOB
> if (virtio_gpu_virgl_enabled(g->parent_obj.conf)) {
> - error_setg(errp, "blobs and virgl are not compatible (yet)");
> + error_setg(errp, "Linked virglrenderer does not support blob
> resources");
> return;
> }
> +#endif
> }
>
> if (!virtio_gpu_base_device_realize(qdev,
> diff --git a/include/hw/virtio/virtio-gpu-bswap.h
> b/include/hw/virtio/virtio-gpu-bswap.h
> index 9124108485..dd1975e2d4 100644
> --- a/include/hw/virtio/virtio-gpu-bswap.h
> +++ b/include/hw/virtio/virtio-gpu-bswap.h
> @@ -63,10 +63,28 @@ virtio_gpu_create_blob_bswap(struct
> virtio_gpu_resource_create_blob *cblob)
> {
> virtio_gpu_ctrl_hdr_bswap(&cblob->hdr);
> le32_to_cpus(&cblob->resource_id);
> + le32_to_cpus(&cblob->blob_mem);
> le32_to_cpus(&cblob->blob_flags);
> + le32_to_cpus(&cblob->nr_entries);
> + le64_to_cpus(&cblob->blob_id);
> le64_to_cpus(&cblob->size);
> }
>
> +static inline void
> +virtio_gpu_map_blob_bswap(struct virtio_gpu_resource_map_blob *mblob)
> +{
> + virtio_gpu_ctrl_hdr_bswap(&mblob->hdr);
> + le32_to_cpus(&mblob->resource_id);
> + le64_to_cpus(&mblob->offset);
> +}
> +
> +static inline void
> +virtio_gpu_unmap_blob_bswap(struct virtio_gpu_resource_unmap_blob *ublob)
> +{
> + virtio_gpu_ctrl_hdr_bswap(&ublob->hdr);
> + le32_to_cpus(&ublob->resource_id);
> +}
> +
> static inline void
> virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb)
> {
> diff --git a/include/hw/virtio/virtio-gpu.h
> b/include/hw/virtio/virtio-gpu.h
> index eafce75b04..4f4cabf3b3 100644
> --- a/include/hw/virtio/virtio-gpu.h
> +++ b/include/hw/virtio/virtio-gpu.h
> @@ -55,6 +55,9 @@ struct virtio_gpu_simple_resource {
> int dmabuf_fd;
> uint8_t *remapped;
>
> + MemoryRegion region;
> + bool mapped;
> +
> QTAILQ_ENTRY(virtio_gpu_simple_resource) next;
> };
>
> @@ -245,6 +248,9 @@ void virtio_gpu_base_fill_display_info(VirtIOGPUBase
> *g,
> struct virtio_gpu_resp_display_info *dpy_info);
>
> /* virtio-gpu.c */
> +struct virtio_gpu_simple_resource *
> +virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
> +
> void virtio_gpu_ctrl_response(VirtIOGPU *g,
> struct virtio_gpu_ctrl_command *cmd,
> struct virtio_gpu_ctrl_hdr *resp,
> diff --git a/meson.build b/meson.build
> index 20fddbd707..058fe03fd7 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -718,6 +718,11 @@ if not get_option('virglrenderer').auto() or
> have_system or have_vhost_user_gpu
> method: 'pkg-config',
> required: get_option('virglrenderer'),
> kwargs: static_kwargs)
> +
> + config_host_data.set('HAVE_VIRGL_RESOURCE_BLOB',
> +
> cc.has_function('virgl_renderer_resource_create_blob',
> + prefix: '#include
> <virglrenderer.h>',
> + dependencies: virgl))
> endif
> curl = not_found
> if not get_option('curl').auto() or have_block
> --
> 2.34.1
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 16030 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/5] virtio-gpu: Blob resources
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
` (4 preceding siblings ...)
2022-08-29 15:40 ` [PATCH 5/5] virtio-gpu: Don't require udmabuf when blob support is enabled Antonio Caggiano
@ 2022-08-30 11:07 ` Marc-André Lureau
2022-09-12 8:58 ` Antonio Caggiano
5 siblings, 1 reply; 11+ messages in thread
From: Marc-André Lureau @ 2022-08-30 11:07 UTC (permalink / raw)
To: Antonio Caggiano; +Cc: qemu-devel, gert.wollny, dmitry.osipenko
[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]
Hi
On Mon, Aug 29, 2022 at 7:46 PM Antonio Caggiano <
antonio.caggiano@collabora.com> wrote:
> Add shared memory and support blob resource creation, mapping and
> unmapping through virglrenderer new stable APIs[0] when available.
>
> [0]
> https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/891
This is merged, and will be part of 0.10 (
https://gitlab.freedesktop.org/virgl/virglrenderer/-/milestones/9#tab-issues),
hopefully soon to be released.
The series looks ok to me, except for the few comments I left. Could you
please update the documentation too?
thanks
>
> Antonio Caggiano (1):
> virtio-gpu: Handle resource blob commands
>
> Dmitry Osipenko (1):
> virtio-gpu: Don't require udmabuf when blob support is enabled
>
> Dr. David Alan Gilbert (1):
> virtio: Add shared memory capability
>
> Gerd Hoffmann (1):
> virtio-gpu: hostmem
>
> Richard Henderson (1):
> Update version for v7.1.0-rc4 release
>
> VERSION | 2 +-
> hw/display/virtio-gpu-pci.c | 15 +++
> hw/display/virtio-gpu-virgl.c | 169 +++++++++++++++++++++++++++
> hw/display/virtio-gpu.c | 25 ++--
> hw/display/virtio-vga.c | 33 ++++--
> hw/virtio/virtio-pci.c | 18 +++
> include/hw/virtio/virtio-gpu-bswap.h | 18 +++
> include/hw/virtio/virtio-gpu.h | 11 ++
> include/hw/virtio/virtio-pci.h | 4 +
> meson.build | 5 +
> 10 files changed, 276 insertions(+), 24 deletions(-)
>
> --
> 2.34.1
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 2585 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/5] virtio-gpu: Blob resources
2022-08-30 11:07 ` [PATCH 0/5] virtio-gpu: Blob resources Marc-André Lureau
@ 2022-09-12 8:58 ` Antonio Caggiano
2022-09-12 9:19 ` Marc-André Lureau
0 siblings, 1 reply; 11+ messages in thread
From: Antonio Caggiano @ 2022-09-12 8:58 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: qemu-devel, gert.wollny, dmitry.osipenko
Hi Marc-André,
On 30/08/2022 13:07, Marc-André Lureau wrote:
> Hi
>
> On Mon, Aug 29, 2022 at 7:46 PM Antonio Caggiano
> <antonio.caggiano@collabora.com <mailto:antonio.caggiano@collabora.com>>
> wrote:
>
> Add shared memory and support blob resource creation, mapping and
> unmapping through virglrenderer new stable APIs[0] when available.
>
> [0]
> https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/891 <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/891>
>
>
> This is merged, and will be part of 0.10
> (https://gitlab.freedesktop.org/virgl/virglrenderer/-/milestones/9#tab-issues <https://gitlab.freedesktop.org/virgl/virglrenderer/-/milestones/9#tab-issues>), hopefully soon to be released.
>
> The series looks ok to me, except for the few comments I left. Could you
> please update the documentation too?
Which documentation are you referring to?
>
> thanks
>
>
>
> Antonio Caggiano (1):
> virtio-gpu: Handle resource blob commands
>
> Dmitry Osipenko (1):
> virtio-gpu: Don't require udmabuf when blob support is enabled
>
> Dr. David Alan Gilbert (1):
> virtio: Add shared memory capability
>
> Gerd Hoffmann (1):
> virtio-gpu: hostmem
>
> Richard Henderson (1):
> Update version for v7.1.0-rc4 release
>
> VERSION | 2 +-
> hw/display/virtio-gpu-pci.c | 15 +++
> hw/display/virtio-gpu-virgl.c | 169 +++++++++++++++++++++++++++
> hw/display/virtio-gpu.c | 25 ++--
> hw/display/virtio-vga.c | 33 ++++--
> hw/virtio/virtio-pci.c | 18 +++
> include/hw/virtio/virtio-gpu-bswap.h | 18 +++
> include/hw/virtio/virtio-gpu.h | 11 ++
> include/hw/virtio/virtio-pci.h | 4 +
> meson.build | 5 +
> 10 files changed, 276 insertions(+), 24 deletions(-)
>
> --
> 2.34.1
>
>
>
>
> --
> Marc-André Lureau
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/5] virtio-gpu: Blob resources
2022-09-12 8:58 ` Antonio Caggiano
@ 2022-09-12 9:19 ` Marc-André Lureau
0 siblings, 0 replies; 11+ messages in thread
From: Marc-André Lureau @ 2022-09-12 9:19 UTC (permalink / raw)
To: Antonio Caggiano; +Cc: qemu-devel, gert.wollny, dmitry.osipenko
[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]
Hi
On Mon, Sep 12, 2022 at 12:58 PM Antonio Caggiano <
antonio.caggiano@collabora.com> wrote:
> Hi Marc-André,
>
> On 30/08/2022 13:07, Marc-André Lureau wrote:
> > Hi
> >
> > On Mon, Aug 29, 2022 at 7:46 PM Antonio Caggiano
> > <antonio.caggiano@collabora.com <mailto:antonio.caggiano@collabora.com>>
>
> > wrote:
> >
> > Add shared memory and support blob resource creation, mapping and
> > unmapping through virglrenderer new stable APIs[0] when available.
> >
> > [0]
> >
> https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/891 <
> https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/891>
> >
> >
> > This is merged, and will be part of 0.10
> > (
> https://gitlab.freedesktop.org/virgl/virglrenderer/-/milestones/9#tab-issues
> <
> https://gitlab.freedesktop.org/virgl/virglrenderer/-/milestones/9#tab-issues>),
> hopefully soon to be released.
> >
> > The series looks ok to me, except for the few comments I left. Could you
> > please update the documentation too?
>
> Which documentation are you referring to?
>
Oh indeed, we really lack documentation about graphics! not your fault ..
could you at least give some hints in the commit message how to enable /
test this feature?
thanks
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 2519 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-09-12 9:22 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-29 15:40 [PATCH 0/5] virtio-gpu: Blob resources Antonio Caggiano
2022-08-29 15:40 ` [PATCH 1/5] Update version for v7.1.0-rc4 release Antonio Caggiano
2022-08-29 21:52 ` Dmitry Osipenko
2022-08-29 15:40 ` [PATCH 2/5] virtio: Add shared memory capability Antonio Caggiano
2022-08-29 15:40 ` [PATCH 3/5] virtio-gpu: hostmem Antonio Caggiano
2022-08-29 15:40 ` [PATCH 4/5] virtio-gpu: Handle resource blob commands Antonio Caggiano
2022-08-30 10:55 ` Marc-André Lureau
2022-08-29 15:40 ` [PATCH 5/5] virtio-gpu: Don't require udmabuf when blob support is enabled Antonio Caggiano
2022-08-30 11:07 ` [PATCH 0/5] virtio-gpu: Blob resources Marc-André Lureau
2022-09-12 8:58 ` Antonio Caggiano
2022-09-12 9:19 ` Marc-André Lureau
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).