@@ -166,6 +166,85 @@ void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res)
}
}
+static void virtio_gpu_free_one_dmabuf(VirtIOGPU *g, VGPUDMABuf *dmabuf,
+ uint32_t scanout_id)
+{
+ struct virtio_gpu_scanout *scanout = &g->parent_obj.scanout[scanout_id];
+
+ QTAILQ_REMOVE(&g->dmabuf.bufs, dmabuf, next);
+ dpy_gl_release_dmabuf(scanout->con, &dmabuf->buf);
+ g_free(dmabuf);
+}
+
+static void virtio_gpu_free_dmabufs(VirtIOGPU *g,
+ uint32_t scanout_id)
+{
+ VGPUDMABuf *dmabuf, *tmp;
+
+ QTAILQ_FOREACH_SAFE(dmabuf, &g->dmabuf.bufs, next, tmp) {
+ if (dmabuf != g->dmabuf.primary &&
+ dmabuf->scanout_id == scanout_id) {
+ virtio_gpu_free_one_dmabuf(g, dmabuf, scanout_id);
+ break;
+ }
+ }
+}
+
+static VGPUDMABuf *virtio_gpu_create_dmabuf(VirtIOGPU *g,
+ uint32_t scanout_id,
+ struct virtio_gpu_simple_resource *res,
+ struct virtio_gpu_framebuffer *fb)
+{
+ VGPUDMABuf *dmabuf;
+
+ if (res->dmabuf_fd < 0) {
+ return NULL;
+ }
+
+ dmabuf = g_new0(VGPUDMABuf, 1);
+ dmabuf->buf.width = fb->width;
+ dmabuf->buf.height = fb->height;
+ dmabuf->buf.stride = fb->stride;
+ dmabuf->buf.fourcc = qemu_pixman_to_drm_format(fb->format);
+ dmabuf->buf.fd = res->dmabuf_fd;
+
+ dmabuf->scanout_id = scanout_id;
+ QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next);
+
+ return dmabuf;
+}
+
+int virtio_gpu_dmabuf_update(VirtIOGPU *g,
+ uint32_t scanout_id,
+ struct virtio_gpu_simple_resource *res,
+ struct virtio_gpu_framebuffer *fb)
+{
+ struct virtio_gpu_scanout *scanout = &g->parent_obj.scanout[scanout_id];
+ VGPUDMABuf *primary;
+ bool free_bufs = false;
+
+ primary = virtio_gpu_create_dmabuf(g, scanout_id, res, fb);
+ if (!primary) {
+ return -EINVAL;
+ }
+
+ if (g->dmabuf.primary != primary) {
+ g->dmabuf.primary = primary;
+ qemu_console_resize(scanout->con,
+ primary->buf.width, primary->buf.height);
+ dpy_gl_scanout_dmabuf(scanout->con, &primary->buf);
+ free_bufs = true;
+ }
+
+ dpy_gl_update(scanout->con, 0, 0, primary->buf.width, primary->buf.height);
+
+ if (free_bufs) {
+ virtio_gpu_free_dmabufs(g, scanout_id);
+ }
+
+ return 0;
+}
+
#else
bool virtio_gpu_have_udmabuf(void)
@@ -184,4 +263,13 @@ void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res)
/* nothing (stub) */
}
+int virtio_gpu_dmabuf_update(VirtIOGPU *g,
+ uint32_t scanout_id,
+ struct virtio_gpu_simple_resource *res,
+ struct virtio_gpu_framebuffer *fb)
+{
+ /* nothing (stub) */
+ return 0;
+}
+
#endif
@@ -149,6 +149,12 @@ struct VirtIOGPUBaseClass {
DEFINE_PROP_UINT32("xres", _state, _conf.xres, 1024), \
DEFINE_PROP_UINT32("yres", _state, _conf.yres, 768)
+typedef struct VGPUDMABuf {
+ QemuDmaBuf buf;
+ uint32_t scanout_id;
+ QTAILQ_ENTRY(VGPUDMABuf) next;
+} VGPUDMABuf;
+
struct VirtIOGPU {
VirtIOGPUBase parent_obj;
@@ -179,6 +185,11 @@ struct VirtIOGPU {
uint32_t req_3d;
uint32_t bytes_3d;
} stats;
+
+ struct {
+ QTAILQ_HEAD(, VGPUDMABuf) bufs;
+ VGPUDMABuf *primary;
+ } dmabuf;
};
struct VhostUserGPU {
@@ -236,6 +247,10 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g);
bool virtio_gpu_have_udmabuf(void);
void virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res);
void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res);
+int virtio_gpu_dmabuf_update(VirtIOGPU *g,
+ uint32_t scanout_id,
+ struct virtio_gpu_simple_resource *res,
+ struct virtio_gpu_framebuffer *fb);
/* virtio-gpu-3d.c */
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
These helpers can be useful for creating dmabuf objects from blobs and submitting them to the UI. Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> --- hw/display/virtio-gpu-udmabuf.c | 88 +++++++++++++++++++++++++++++++++ include/hw/virtio/virtio-gpu.h | 15 ++++++ 2 files changed, 103 insertions(+)