[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 1/2] virgl: Implement resource_query_layout
From: Daniel Stone <daniels@xxxxxxxxxxxxx> A new ioctl to shuttle information between host and guest about the actual buffer allocation, which can be used for interop between GL and Vulkan when supporting standard window systems. --- hw/display/virtio-gpu-base.c | 4 ++ hw/display/virtio-gpu-virgl.c | 49 +++++++++++++++++++++ include/hw/virtio/virtio-gpu-bswap.h | 7 +++ include/standard-headers/linux/virtio_gpu.h | 29 ++++++++++++ meson.build | 4 ++ 5 files changed, 93 insertions(+) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index 8d8aa2c88f..efaa681e54 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -246,6 +246,10 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64_t features, features |= (1 << VIRTIO_GPU_F_RESOURCE_UUID); features |= (1 << VIRTIO_GPU_F_CONTEXT_FENCE_WAIT); +#ifdef HAVE_VIRGL_RESOURCE_QUERY_LAYOUT + features |= (1 << VIRTIO_GPU_F_RESOURCE_QUERY_LAYOUT); +#endif /* HAVE_VIRGL_RESOURCE_QUERY_LAYOUT */ + return features; } diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 2ac9a8b864..9c5a07cef1 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -715,6 +715,55 @@ static void virgl_cmd_resource_unmap_blob(VirtIOGPU *g, virtio_gpu_virgl_resource_unmap(g, cmd->cmd_hdr.ctx_id, res); } +#ifdef HAVE_VIRGL_RESOURCE_QUERY_LAYOUT +static void virgl_cmd_resource_query_layout(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_query_layout qlayout; + struct virtio_gpu_resp_resource_layout resp; + struct virgl_renderer_resource_layout rlayout; + int ret; + int i; + VIRTIO_GPU_FILL_CMD(qlayout); + virtio_gpu_resource_query_layout_bswap(&qlayout); + + if (qlayout.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, qlayout.resource_id); + if (!res) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n", + __func__, qlayout.resource_id); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; + return; + } + + ret = virgl_renderer_resource_query_layout(qlayout.resource_id, &rlayout); + if (ret != 0) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource %d is not externally-allocated\n", + __func__, qlayout.resource_id); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; + return; + } + + memset(&resp, 0, sizeof(resp)); + resp.hdr.type = VIRTIO_GPU_RESP_OK_RESOURCE_LAYOUT; + resp.num_planes = rlayout.num_planes; + resp.modifier = rlayout.modifier; + for (i = 0; i < resp.num_planes; i++) { + resp.planes[i].offset = rlayout.planes[i].offset; + resp.planes[i].stride = rlayout.planes[i].stride; + resp.planes[i].size = rlayout.planes[i].size; + } + virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp)); +} +#endif /* HAVE_VIRGL_RESOURCE_QUERY_LAYOUT */ + void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) { diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virtio-gpu-bswap.h index 8bbca1e751..49316758cc 100644 --- a/include/hw/virtio/virtio-gpu-bswap.h +++ b/include/hw/virtio/virtio-gpu-bswap.h @@ -99,4 +99,11 @@ virtio_gpu_host_wait_bswap(struct virtio_gpu_cmd_host_wait *host_wait) le64_to_cpus(&host_wait->fence_id); } +static inline void +virtio_gpu_resource_query_layout_bswap(struct virtio_gpu_resource_query_layout *rql) +{ + virtio_gpu_ctrl_hdr_bswap(&rql->hdr); + le32_to_cpus(&rql->resource_id); +} + #endif diff --git a/include/standard-headers/linux/virtio_gpu.h b/include/standard-headers/linux/virtio_gpu.h index a04419757f..734fdb6beb 100644 --- a/include/standard-headers/linux/virtio_gpu.h +++ b/include/standard-headers/linux/virtio_gpu.h @@ -70,6 +70,11 @@ */ #define VIRTIO_GPU_F_CONTEXT_FENCE_WAIT 5 +/* + * VIRTIO_GPU_CMD_RESOURCE_QUERY_LAYOUT + */ +#define VIRTIO_GPU_F_RESOURCE_QUERY_LAYOUT 6 + enum virtio_gpu_ctrl_type { VIRTIO_GPU_UNDEFINED = 0, @@ -102,6 +107,7 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB, VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB, VIRTIO_GPU_CMD_WAIT_FENCE, + VIRTIO_GPU_CMD_RESOURCE_QUERY_LAYOUT, /* cursor commands */ VIRTIO_GPU_CMD_UPDATE_CURSOR = 0x0300, @@ -115,6 +121,7 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_RESP_OK_EDID, VIRTIO_GPU_RESP_OK_RESOURCE_UUID, VIRTIO_GPU_RESP_OK_MAP_INFO, + VIRTIO_GPU_RESP_OK_RESOURCE_LAYOUT, /* error responses */ VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200, @@ -495,4 +502,26 @@ struct virtio_gpu_status_freezing { __u32 freezing; }; +/* VIRTIO_GPU_CMD_RESOURCE_QUERY_LAYOUT */ +struct virtio_gpu_resource_query_layout { + struct virtio_gpu_ctrl_hdr hdr; + uint32_t resource_id; + uint32_t padding; +}; + +/* VIRTIO_GPU_RESP_OK_RESOURCE_LAYOUT */ +#define VIRTIO_GPU_RES_MAX_PLANES 4 +struct virtio_gpu_resp_resource_layout { + struct virtio_gpu_ctrl_hdr hdr; + uint64_t modifier; + uint32_t num_planes; + uint32_t padding; + struct virtio_gpu_resource_plane { + uint64_t offset; + uint64_t size; + uint32_t stride; + uint32_t padding; + } planes[VIRTIO_GPU_RES_MAX_PLANES]; +}; + #endif diff --git a/meson.build b/meson.build index 59235aff28..0c20a00daa 100644 --- a/meson.build +++ b/meson.build @@ -790,6 +790,10 @@ if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu 'get_egl_display', prefix: '#include <virglrenderer.h>', dependencies: virgl)) + config_host_data.set('HAVE_VIRGL_RESOURCE_QUERY_LAYOUT', + cc.has_function('virgl_renderer_resource_query_layout', + prefix: '#include <virglrenderer.h>', + dependencies: virgl)) endif blkio = not_found if not get_option('blkio').auto() or have_block -- 2.34.1
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |