From nobody Fri Oct 24 22:13:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519721824065513.4204114265203; Tue, 27 Feb 2018 00:57:04 -0800 (PST) Received: from localhost ([::1]:35589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqb4I-0006uG-O1 for importer@patchew.org; Tue, 27 Feb 2018 03:57:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqazp-0003QQ-Qz for qemu-devel@nongnu.org; Tue, 27 Feb 2018 03:52:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqazn-000827-4c for qemu-devel@nongnu.org; Tue, 27 Feb 2018 03:52:25 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44868 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqazm-00081D-Tv for qemu-devel@nongnu.org; Tue, 27 Feb 2018 03:52:23 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F4FD402243B; Tue, 27 Feb 2018 08:52:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 382B01C738; Tue, 27 Feb 2018 08:52:18 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5A84FA1E1; Tue, 27 Feb 2018 09:52:10 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 27 Feb 2018 09:52:09 +0100 Message-Id: <20180227085209.19151-8-kraxel@redhat.com> In-Reply-To: <20180227085209.19151-1-kraxel@redhat.com> References: <20180227085209.19151-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 27 Feb 2018 08:52:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 27 Feb 2018 08:52:22 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v5 7/7] vfio/display: adding dmabuf support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Williamson , Gerd Hoffmann , intel-gvt-dev@lists.freedesktop.org, Kirti Wankhede , Tina Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Wire up dmabuf-based display. Signed-off-by: Gerd Hoffmann --- include/hw/vfio/vfio-common.h | 14 ++++ hw/vfio/display.c | 147 ++++++++++++++++++++++++++++++++++++++= +++- 2 files changed, 159 insertions(+), 2 deletions(-) diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index fc8ae14fb7..994e780d51 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -26,6 +26,7 @@ #include "exec/memory.h" #include "qemu/queue.h" #include "qemu/notify.h" +#include "ui/console.h" #ifdef CONFIG_LINUX #include #endif @@ -142,12 +143,25 @@ typedef struct VFIOGroup { QLIST_ENTRY(VFIOGroup) container_next; } VFIOGroup; =20 +typedef struct VFIODMABuf { + QemuDmaBuf buf; + uint32_t pos_x, pos_y; + uint32_t hot_x, hot_y; + int dmabuf_id; + QTAILQ_ENTRY(VFIODMABuf) next; +} VFIODMABuf; + typedef struct VFIODisplay { QemuConsole *con; struct { VFIORegion buffer; DisplaySurface *surface; } region; + struct { + QTAILQ_HEAD(, VFIODMABuf) bufs; + VFIODMABuf *primary; + VFIODMABuf *cursor; + } dmabuf; } VFIODisplay; =20 void vfio_put_base_device(VFIODevice *vbasedev); diff --git a/hw/vfio/display.c b/hw/vfio/display.c index 8910f927e3..0ec3532014 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -19,6 +19,150 @@ #include "qapi/error.h" #include "pci.h" =20 +#ifndef DRM_PLANE_TYPE_PRIMARY +# define DRM_PLANE_TYPE_PRIMARY 1 +# define DRM_PLANE_TYPE_CURSOR 2 +#endif + +static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev, + uint32_t plane_type) +{ + VFIODisplay *dpy =3D vdev->dpy; + struct vfio_device_gfx_plane_info plane; + VFIODMABuf *dmabuf; + int fd, ret; + + memset(&plane, 0, sizeof(plane)); + plane.argsz =3D sizeof(plane); + plane.flags =3D VFIO_GFX_PLANE_TYPE_DMABUF; + plane.drm_plane_type =3D plane_type; + ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, &plane); + if (ret < 0) { + return NULL; + } + if (!plane.drm_format || !plane.size) { + return NULL; + } + + QTAILQ_FOREACH(dmabuf, &dpy->dmabuf.bufs, next) { + if (dmabuf->dmabuf_id =3D=3D plane.dmabuf_id) { + /* found in list, move to head, return it */ + QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); + QTAILQ_INSERT_HEAD(&dpy->dmabuf.bufs, dmabuf, next); + if (plane_type =3D=3D DRM_PLANE_TYPE_CURSOR) { + dmabuf->pos_x =3D plane.x_pos; + dmabuf->pos_y =3D plane.y_pos; + } + return dmabuf; + } + } + + fd =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_GFX_DMABUF, &plane.dma= buf_id); + if (fd < 0) { + return NULL; + } + + dmabuf =3D g_new0(VFIODMABuf, 1); + dmabuf->dmabuf_id =3D plane.dmabuf_id; + dmabuf->buf.width =3D plane.width; + dmabuf->buf.height =3D plane.height; + dmabuf->buf.stride =3D plane.stride; + dmabuf->buf.fourcc =3D plane.drm_format; + dmabuf->buf.fd =3D fd; + if (plane_type =3D=3D DRM_PLANE_TYPE_CURSOR) { + dmabuf->pos_x =3D plane.x_pos; + dmabuf->pos_y =3D plane.y_pos; + dmabuf->hot_x =3D plane.x_hot; + dmabuf->hot_y =3D plane.y_hot; + } + + QTAILQ_INSERT_HEAD(&dpy->dmabuf.bufs, dmabuf, next); + return dmabuf; +} + +static void vfio_display_free_dmabufs(VFIOPCIDevice *vdev) +{ + VFIODisplay *dpy =3D vdev->dpy; + VFIODMABuf *dmabuf, *tmp; + uint32_t keep =3D 5; + + QTAILQ_FOREACH_SAFE(dmabuf, &dpy->dmabuf.bufs, next, tmp) { + if (keep > 0) { + keep--; + continue; + } + assert(dmabuf !=3D dpy->dmabuf.primary); + QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); + dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); + close(dmabuf->buf.fd); + g_free(dmabuf); + } +} + +static void vfio_display_dmabuf_update(void *opaque) +{ + VFIOPCIDevice *vdev =3D opaque; + VFIODisplay *dpy =3D vdev->dpy; + VFIODMABuf *primary, *cursor; + bool free_bufs =3D false; + + primary =3D vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY); + if (primary =3D=3D NULL) { + return; + } + + if (dpy->dmabuf.primary !=3D primary) { + dpy->dmabuf.primary =3D primary; + qemu_console_resize(dpy->con, + primary->buf.width, primary->buf.height); + dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); + free_bufs =3D true; + } + + cursor =3D vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_CURSOR); + if (dpy->dmabuf.cursor !=3D cursor) { + dpy->dmabuf.cursor =3D cursor; + if (cursor) { + bool have_hot =3D (cursor->hot_x !=3D 0xffffffff && + cursor->hot_y !=3D 0xffffffff); + dpy_gl_cursor_dmabuf(dpy->con, &cursor->buf, have_hot, + cursor->hot_x, cursor->hot_y); + } else { + dpy_gl_cursor_dmabuf(dpy->con, NULL, false, 0, 0); + } + free_bufs =3D true; + } + if (cursor !=3D NULL) { + dpy_gl_cursor_position(dpy->con, + cursor->pos_x, + cursor->pos_y); + } + + dpy_gl_update(dpy->con, 0, 0, primary->buf.width, primary->buf.height); + + if (free_bufs) { + vfio_display_free_dmabufs(vdev); + } +} + +static const GraphicHwOps vfio_display_dmabuf_ops =3D { + .gfx_update =3D vfio_display_dmabuf_update, +}; + +static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp) +{ + if (!display_opengl) { + error_setg(errp, "vfio-display-dmabuf: opengl not available"); + return -1; + } + + vdev->dpy =3D g_new0(VFIODisplay, 1); + vdev->dpy->con =3D graphic_console_init(DEVICE(vdev), 0, + &vfio_display_dmabuf_ops, + vdev); + return 0; +} + /* ---------------------------------------------------------------------- = */ =20 static void vfio_display_region_update(void *opaque) @@ -126,8 +270,7 @@ int vfio_display_probe(VFIOPCIDevice *vdev, Error **err= p) probe.flags =3D VFIO_GFX_PLANE_TYPE_PROBE | VFIO_GFX_PLANE_TYPE_DMABUF; ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, &probe); if (ret =3D=3D 0) { - error_setg(errp, "vfio-display: dmabuf support not implemented yet= "); - return -1; + return vfio_display_dmabuf_init(vdev, errp); } =20 memset(&probe, 0, sizeof(probe)); --=20 2.9.3