This is prep-work for adding the ability to create dmabuf fds from VFIO devices in addition to udmabuf.
Cc: Marc-André Lureau <[email protected]> Cc: Alex Bennée <[email protected]> Cc: Akihiko Odaki <[email protected]> Cc: Dmitry Osipenko <[email protected]> Cc: Alex Williamson <[email protected]> Cc: Cédric Le Goater <[email protected]> Reviewed-by: Akihiko Odaki <[email protected]> Signed-off-by: Vivek Kasireddy <[email protected]> --- include/hw/virtio/virtio-gpu.h | 6 +++--- ...o-gpu-udmabuf-stubs.c => virtio-gpu-dmabuf-stubs.c} | 4 ++-- .../{virtio-gpu-udmabuf.c => virtio-gpu-dmabuf.c} | 10 +++++----- hw/display/virtio-gpu.c | 8 ++++---- hw/display/meson.build | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) rename hw/display/{virtio-gpu-udmabuf-stubs.c => virtio-gpu-dmabuf-stubs.c} (79%) rename hw/display/{virtio-gpu-udmabuf.c => virtio-gpu-dmabuf.c} (94%) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 631dfc63a4..4f3a5c6fb3 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -388,10 +388,10 @@ bool virtio_gpu_scanout_blob_to_fb(struct virtio_gpu_framebuffer *fb, struct virtio_gpu_set_scanout_blob *ss, uint64_t blob_size); -/* virtio-gpu-udmabuf.c */ +/* virtio-gpu-dmabuf.c */ bool virtio_gpu_have_udmabuf(void); -bool virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res); -void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res); +bool virtio_gpu_init_dmabuf(struct virtio_gpu_simple_resource *res); +void virtio_gpu_fini_dmabuf(struct virtio_gpu_simple_resource *res); int virtio_gpu_update_dmabuf(VirtIOGPU *g, uint32_t scanout_id, struct virtio_gpu_simple_resource *res, diff --git a/hw/display/virtio-gpu-udmabuf-stubs.c b/hw/display/virtio-gpu-dmabuf-stubs.c similarity index 79% rename from hw/display/virtio-gpu-udmabuf-stubs.c rename to hw/display/virtio-gpu-dmabuf-stubs.c index 1a9dfbdec1..83c3e16c23 100644 --- a/hw/display/virtio-gpu-udmabuf-stubs.c +++ b/hw/display/virtio-gpu-dmabuf-stubs.c @@ -7,13 +7,13 @@ bool virtio_gpu_have_udmabuf(void) return false; } -bool virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res) +bool virtio_gpu_init_dmabuf(struct virtio_gpu_simple_resource *res) { /* nothing (stub) */ return false; } -void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res) +void virtio_gpu_fini_dmabuf(struct virtio_gpu_simple_resource *res) { /* nothing (stub) */ } diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-dmabuf.c similarity index 94% rename from hw/display/virtio-gpu-udmabuf.c rename to hw/display/virtio-gpu-dmabuf.c index 6d2bc8d977..c537ec0a8c 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-dmabuf.c @@ -71,7 +71,7 @@ static void virtio_gpu_create_udmabuf(struct virtio_gpu_simple_resource *res) g_free(list); } -static void virtio_gpu_remap_udmabuf(struct virtio_gpu_simple_resource *res) +static void virtio_gpu_remap_dmabuf(struct virtio_gpu_simple_resource *res) { res->remapped = mmap(NULL, res->blob_size, PROT_READ, MAP_SHARED, res->dmabuf_fd, 0); @@ -82,7 +82,7 @@ static void virtio_gpu_remap_udmabuf(struct virtio_gpu_simple_resource *res) } } -void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res) +void virtio_gpu_fini_dmabuf(struct virtio_gpu_simple_resource *res) { if (res->remapped) { munmap(res->remapped, res->blob_size); @@ -133,7 +133,7 @@ bool virtio_gpu_have_udmabuf(void) return memfd_backend; } -bool virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res) +bool virtio_gpu_init_dmabuf(struct virtio_gpu_simple_resource *res) { void *pdata = NULL; @@ -146,9 +146,9 @@ bool virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res) if (res->dmabuf_fd < 0) { return false; } - virtio_gpu_remap_udmabuf(res); + virtio_gpu_remap_dmabuf(res); if (!res->remapped) { - virtio_gpu_fini_udmabuf(res); + virtio_gpu_fini_dmabuf(res); return false; } res->share_handle = res->dmabuf_fd; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 386db05e5b..c7346c8c68 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -407,7 +407,7 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU *g, return; } - if (!virtio_gpu_init_udmabuf(res)) { + if (!virtio_gpu_init_dmabuf(res)) { cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; virtio_gpu_cleanup_mapping(g, res); g_free(res); @@ -1091,7 +1091,7 @@ void virtio_gpu_cleanup_mapping(VirtIOGPU *g, res->addrs = NULL; if (res->blob) { - virtio_gpu_fini_udmabuf(res); + virtio_gpu_fini_dmabuf(res); } } @@ -1136,7 +1136,7 @@ virtio_gpu_resource_attach_backing(VirtIOGPU *g, return; } - if (!res->image && !virtio_gpu_init_udmabuf(res)) { + if (!res->image && !virtio_gpu_init_dmabuf(res)) { cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; virtio_gpu_cleanup_mapping(g, res); } @@ -1652,7 +1652,7 @@ static int virtio_gpu_blob_load(QEMUFile *f, void *opaque, size_t size, return -EINVAL; } - if (!virtio_gpu_init_udmabuf(res)) { + if (!virtio_gpu_init_dmabuf(res)) { virtio_gpu_cleanup_mapping(g, res); g_free(res); return -EINVAL; diff --git a/hw/display/meson.build b/hw/display/meson.build index d8b4e121fe..89b8f74b7d 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -73,9 +73,9 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'), pixman]) if host_os == 'linux' - virtio_gpu_ss.add(files('virtio-gpu-udmabuf.c')) + virtio_gpu_ss.add(files('virtio-gpu-dmabuf.c')) else - virtio_gpu_ss.add(files('virtio-gpu-udmabuf-stubs.c')) + virtio_gpu_ss.add(files('virtio-gpu-dmabuf-stubs.c')) endif virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-user-gpu.c')) hw_display_modules += {'virtio-gpu': virtio_gpu_ss} -- 2.53.0
