From nobody Thu May 16 14:04:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1713222772; cv=none; d=zohomail.com; s=zohoarc; b=I30ZOYBPsLhVugxo66eRlGRSQcFX8eMRTBsCLNTQ7rCXHUW8HpVVxOw86jn/3nqqcrQcjEFG4JeggiynWwAqSQQxAjDnWtUXwHLUdWMjXaqK98bFljwgpH5MfAYTmQnXMaoX8BXJNv3uwCtAxl+Y43s2watFnVcAUuUafXktU/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713222772; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Azybx3bHuELtssyeoTRpFPyNVY8YQVOJyxTcP5Bm024=; b=CYRBhy7Zr0VHrjiLYSlGHAm7W0BUJlc45VMdnoMTXNMmcZ0mICZU1NjL2voOgDCm7OlMNqQ478YUlZUpgz9I8zF4CNnLq3sQNsp9+mJkLTqKRwEUMRzGF7IZqetcY78fo97cMNxS3LJGlX/2+e2PtQm5VOygYPgljjeQWI0kUtg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713222772176565.222300748091; Mon, 15 Apr 2024 16:12:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwVUJ-0004jI-7B; Mon, 15 Apr 2024 19:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwVUH-0004ij-2Z for qemu-devel@nongnu.org; Mon, 15 Apr 2024 19:11:45 -0400 Received: from mgamail.intel.com ([192.198.163.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwVUC-0004QK-K8 for qemu-devel@nongnu.org; Mon, 15 Apr 2024 19:11:43 -0400 Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:11:34 -0700 Received: from dongwonk-z390-aorus-ultra.fm.intel.com ([10.105.129.124]) by fmviesa004.fm.intel.com with ESMTP; 15 Apr 2024 16:11:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713222701; x=1744758701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ig7G83XbjguPKjKmrscIHzl9NxD4Psk0IPWQ9rYKdTo=; b=CKDbp47wCtdQTy0ND0OjHkdWSI6eAgOg500fO9E4uPtjjwEu0Mi0cFFo aMqFQvTxKNwmrPgC4/Lj6xbVeVlN6zeDYEQmll38t05eJuuwKV4/i0F+A 07UnVdjZUgagKZvPFcYzvI9v+huNaNh1LNEfW9HJQen5c3S/hMxVmPOVV mWvWRc1LsSZOAOIYg/JtHiImGhKs78fP0uJB899NRIzGA1dmWBb4mS2Jn GsaEuhyNnKnJ2xFibSDPiaZ8QqhlYYLxao3F+CnfuPJeFWUXGMzWym0db FtdcKPOS1zKyp0ayikMRXDJtjXiGTnkhnpIJrVthb6UeRgInTZZtL+Ql9 A==; X-CSE-ConnectionGUID: j/xjWY+xSjSFXsJQgO5rRA== X-CSE-MsgGUID: RDWkQYC/TfeLXb/6a/5zYg== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="19242738" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="19242738" X-CSE-ConnectionGUID: mUO0J4vmR6GwiXW/MV8fqw== X-CSE-MsgGUID: N/FhWNX2RuCenj7VQgZMLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="26726944" From: dongwon.kim@intel.com To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com Subject: [PATCH v5 1/3] ui/console: Introduce dpy_gl_qemu_dmabuf_get_..() helpers Date: Mon, 15 Apr 2024 16:07:22 -0700 Message-Id: <20240415230724.9573-2-dongwon.kim@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415230724.9573-1-dongwon.kim@intel.com> References: <20240415230724.9573-1-dongwon.kim@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.11; envelope-from=dongwon.kim@intel.com; helo=mgamail.intel.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.185, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1713222772629100001 From: Dongwon Kim This commit introduces dpy_gl_qemu_dmabuf_get_... helpers to extract specific fields from the QemuDmaBuf struct. It also updates all instances where fields within the QemuDmaBuf struct are directly accessed, replacing them with calls to these new helper functions. Suggested-by: Marc-Andr=C3=A9 Lureau Cc: Philippe Mathieu-Daud=C3=A9 Cc: Vivek Kasireddy Signed-off-by: Dongwon Kim --- include/ui/console.h | 17 +++++ hw/display/vhost-user-gpu.c | 6 +- hw/display/virtio-gpu-udmabuf.c | 7 +- hw/vfio/display.c | 15 +++-- ui/console.c | 116 +++++++++++++++++++++++++++++++- ui/dbus-console.c | 9 ++- ui/dbus-listener.c | 43 +++++++----- ui/egl-headless.c | 23 +++++-- ui/egl-helpers.c | 47 +++++++------ ui/gtk-egl.c | 48 ++++++++----- ui/gtk-gl-area.c | 37 ++++++---- ui/gtk.c | 6 +- ui/spice-display.c | 50 ++++++++------ 13 files changed, 316 insertions(+), 108 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 0bc7a00ac0..6292943a82 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -358,6 +358,23 @@ void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf= *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y); void dpy_gl_cursor_position(QemuConsole *con, uint32_t pos_x, uint32_t pos_y); + +int32_t dpy_gl_qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_width(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_height(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_stride(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_fourcc(QemuDmaBuf *dmabuf); +uint64_t dpy_gl_qemu_dmabuf_get_modifier(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_texture(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_x(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_y(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_backing_width(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_qemu_dmabuf_get_backing_height(QemuDmaBuf *dmabuf); +bool dpy_gl_qemu_dmabuf_get_y0_top(QemuDmaBuf *dmabuf); +void *dpy_gl_qemu_dmabuf_get_sync(QemuDmaBuf *dmabuf); +int32_t dpy_gl_qemu_dmabuf_get_fence_fd(QemuDmaBuf *dmabuf); +bool dpy_gl_qemu_dmabuf_get_allow_fences(QemuDmaBuf *dmabuf); +bool dpy_gl_qemu_dmabuf_get_draw_submitted(QemuDmaBuf *dmabuf); void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf); void dpy_gl_update(QemuConsole *con, diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 709c8a02a1..87dcfbca10 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -249,6 +249,7 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) case VHOST_USER_GPU_DMABUF_SCANOUT: { VhostUserGpuDMABUFScanout *m =3D &msg->payload.dmabuf_scanout; int fd =3D qemu_chr_fe_get_msgfd(&g->vhost_chr); + int old_fd; QemuDmaBuf *dmabuf; =20 if (m->scanout_id >=3D g->parent_obj.conf.max_outputs) { @@ -262,8 +263,9 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) g->parent_obj.enable =3D 1; con =3D g->parent_obj.scanout[m->scanout_id].con; dmabuf =3D &g->dmabuf[m->scanout_id]; - if (dmabuf->fd >=3D 0) { - close(dmabuf->fd); + old_fd =3D dpy_gl_qemu_dmabuf_get_fd(dmabuf); + if (old_fd >=3D 0) { + close(old_fd); dmabuf->fd =3D -1; } dpy_gl_release_dmabuf(con, dmabuf); diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index d51184d658..e3f358b575 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -206,6 +206,7 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, { struct virtio_gpu_scanout *scanout =3D &g->parent_obj.scanout[scanout_= id]; VGPUDMABuf *new_primary, *old_primary =3D NULL; + uint32_t width, height; =20 new_primary =3D virtio_gpu_create_dmabuf(g, scanout_id, res, fb, r); if (!new_primary) { @@ -216,10 +217,10 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, old_primary =3D g->dmabuf.primary[scanout_id]; } =20 + width =3D dpy_gl_qemu_dmabuf_get_width(&new_primary->buf); + height =3D dpy_gl_qemu_dmabuf_get_height(&new_primary->buf); g->dmabuf.primary[scanout_id] =3D new_primary; - qemu_console_resize(scanout->con, - new_primary->buf.width, - new_primary->buf.height); + qemu_console_resize(scanout->con, width, height); dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); =20 if (old_primary) { diff --git a/hw/vfio/display.c b/hw/vfio/display.c index 1aa440c663..f9c39cbd51 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -259,9 +259,13 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevi= ce *vdev, =20 static void vfio_display_free_one_dmabuf(VFIODisplay *dpy, VFIODMABuf *dma= buf) { + int fd; + QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); + + fd =3D dpy_gl_qemu_dmabuf_get_fd(&dmabuf->buf); dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); - close(dmabuf->buf.fd); + close(fd); g_free(dmabuf); } =20 @@ -286,6 +290,7 @@ static void vfio_display_dmabuf_update(void *opaque) VFIOPCIDevice *vdev =3D opaque; VFIODisplay *dpy =3D vdev->dpy; VFIODMABuf *primary, *cursor; + uint32_t width, height; bool free_bufs =3D false, new_cursor =3D false; =20 primary =3D vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY); @@ -296,10 +301,12 @@ static void vfio_display_dmabuf_update(void *opaque) return; } =20 + width =3D dpy_gl_qemu_dmabuf_get_width(&primary->buf); + height =3D dpy_gl_qemu_dmabuf_get_height(&primary->buf); + if (dpy->dmabuf.primary !=3D primary) { dpy->dmabuf.primary =3D primary; - qemu_console_resize(dpy->con, - primary->buf.width, primary->buf.height); + qemu_console_resize(dpy->con, width, height); dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); free_bufs =3D true; } @@ -328,7 +335,7 @@ static void vfio_display_dmabuf_update(void *opaque) cursor->pos_updates =3D 0; } =20 - dpy_gl_update(dpy->con, 0, 0, primary->buf.width, primary->buf.height); + dpy_gl_update(dpy->con, 0, 0, width, height); =20 if (free_bufs) { vfio_display_free_dmabufs(vdev); diff --git a/ui/console.c b/ui/console.c index 43226c5c14..5d5635f783 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1132,6 +1132,118 @@ void dpy_gl_cursor_position(QemuConsole *con, } } =20 +int32_t dpy_gl_qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->fd; +} + +uint32_t dpy_gl_qemu_dmabuf_get_width(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->width; +} + +uint32_t dpy_gl_qemu_dmabuf_get_height(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->height; +} + +uint32_t dpy_gl_qemu_dmabuf_get_stride(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->stride; +} + +uint32_t dpy_gl_qemu_dmabuf_get_fourcc(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->fourcc; +} + +uint64_t dpy_gl_qemu_dmabuf_get_modifier(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->modifier; +} + +uint32_t dpy_gl_qemu_dmabuf_get_texture(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->texture; +} + +uint32_t dpy_gl_qemu_dmabuf_get_x(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->x; +} + +uint32_t dpy_gl_qemu_dmabuf_get_y(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->y; +} + +uint32_t dpy_gl_qemu_dmabuf_get_backing_width(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->backing_width; +} + +uint32_t dpy_gl_qemu_dmabuf_get_backing_height(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->backing_height; +} + +bool dpy_gl_qemu_dmabuf_get_y0_top(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->y0_top; +} + +void *dpy_gl_qemu_dmabuf_get_sync(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->sync; +} + +int32_t dpy_gl_qemu_dmabuf_get_fence_fd(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->fence_fd; +} + +bool dpy_gl_qemu_dmabuf_get_allow_fences(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->allow_fences; +} + +bool dpy_gl_qemu_dmabuf_get_draw_submitted(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->draw_submitted; +} + void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf) { @@ -1459,7 +1571,7 @@ int qemu_console_get_width(QemuConsole *con, int fall= back) } switch (con->scanout.kind) { case SCANOUT_DMABUF: - return con->scanout.dmabuf->width; + return dpy_gl_qemu_dmabuf_get_width(con->scanout.dmabuf); case SCANOUT_TEXTURE: return con->scanout.texture.width; case SCANOUT_SURFACE: @@ -1476,7 +1588,7 @@ int qemu_console_get_height(QemuConsole *con, int fal= lback) } switch (con->scanout.kind) { case SCANOUT_DMABUF: - return con->scanout.dmabuf->height; + return dpy_gl_qemu_dmabuf_get_height(con->scanout.dmabuf); case SCANOUT_TEXTURE: return con->scanout.texture.height; case SCANOUT_SURFACE: diff --git a/ui/dbus-console.c b/ui/dbus-console.c index 49da9ccc83..124fe16253 100644 --- a/ui/dbus-console.c +++ b/ui/dbus-console.c @@ -110,11 +110,14 @@ static void dbus_gl_scanout_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf) { + uint32_t width, height; + DBusDisplayConsole *ddc =3D container_of(dcl, DBusDisplayConsole, dcl); =20 - dbus_display_console_set_size(ddc, - dmabuf->width, - dmabuf->height); + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + + dbus_display_console_set_size(ddc, width, height); } =20 static void diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 4a0a5d78f9..c6c7d93753 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -278,29 +278,33 @@ static void dbus_scanout_dmabuf(DisplayChangeListener= *dcl, DBusDisplayListener *ddl =3D container_of(dcl, DBusDisplayListener, dc= l); g_autoptr(GError) err =3D NULL; g_autoptr(GUnixFDList) fd_list =3D NULL; + int fd; + uint32_t width, height, stride, fourcc; + uint64_t modifier; + bool y0_top; =20 + fd =3D dpy_gl_qemu_dmabuf_get_fd(dmabuf); fd_list =3D g_unix_fd_list_new(); - if (g_unix_fd_list_append(fd_list, dmabuf->fd, &err) !=3D 0) { + if (g_unix_fd_list_append(fd_list, fd, &err) !=3D 0) { error_report("Failed to setup dmabuf fdlist: %s", err->message); return; } =20 ddl_discard_pending_messages(ddl); =20 + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + stride =3D dpy_gl_qemu_dmabuf_get_stride(dmabuf); + fourcc =3D dpy_gl_qemu_dmabuf_get_fourcc(dmabuf); + modifier =3D dpy_gl_qemu_dmabuf_get_modifier(dmabuf); + y0_top =3D dpy_gl_qemu_dmabuf_get_y0_top(dmabuf); + /* FIXME: add missing x/y/w/h support */ qemu_dbus_display1_listener_call_scanout_dmabuf( - ddl->proxy, - g_variant_new_handle(0), - dmabuf->width, - dmabuf->height, - dmabuf->stride, - dmabuf->fourcc, - dmabuf->modifier, - dmabuf->y0_top, - G_DBUS_CALL_FLAGS_NONE, - -1, - fd_list, - NULL, NULL, NULL); + ddl->proxy, g_variant_new_handle(0), + width, height, stride, fourcc, modifier, + y0_top, G_DBUS_CALL_FLAGS_NONE, + -1, fd_list, NULL, NULL, NULL); } #endif /* GBM */ #endif /* OPENGL */ @@ -488,6 +492,7 @@ static void dbus_cursor_dmabuf(DisplayChangeListener *d= cl, DisplaySurface *ds; GVariant *v_data =3D NULL; egl_fb cursor_fb =3D EGL_FB_INIT; + uint32_t width, height, texture; =20 if (!dmabuf) { qemu_dbus_display1_listener_call_mouse_set( @@ -497,12 +502,16 @@ static void dbus_cursor_dmabuf(DisplayChangeListener = *dcl, } =20 egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (!texture) { return; } - egl_fb_setup_for_tex(&cursor_fb, dmabuf->width, dmabuf->height, - dmabuf->texture, false); - ds =3D qemu_create_displaysurface(dmabuf->width, dmabuf->height); + + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + + egl_fb_setup_for_tex(&cursor_fb, width, height, texture, false); + ds =3D qemu_create_displaysurface(width, height); egl_fb_read(ds, &cursor_fb); =20 v_data =3D g_variant_new_from_data( diff --git a/ui/egl-headless.c b/ui/egl-headless.c index d5637dadb2..158924379b 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -85,29 +85,38 @@ static void egl_scanout_texture(DisplayChangeListener *= dcl, static void egl_scanout_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf) { + uint32_t width, height, texture; + egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (!texture) { return; } =20 - egl_scanout_texture(dcl, dmabuf->texture, - false, dmabuf->width, dmabuf->height, - 0, 0, dmabuf->width, dmabuf->height, NULL); + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + + egl_scanout_texture(dcl, texture, false, width, height, 0, 0, + width, height, NULL); } =20 static void egl_cursor_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y) { + uint32_t width, height, texture; egl_dpy *edpy =3D container_of(dcl, egl_dpy, dcl); =20 if (dmabuf) { egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (!texture) { return; } - egl_fb_setup_for_tex(&edpy->cursor_fb, dmabuf->width, dmabuf->heig= ht, - dmabuf->texture, false); + + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + egl_fb_setup_for_tex(&edpy->cursor_fb, width, height, texture, fal= se); } else { egl_fb_destroy(&edpy->cursor_fb); } diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 3d19dbe382..86d64c68ce 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -146,10 +146,10 @@ void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip) glViewport(0, 0, dst->width, dst->height); =20 if (src->dmabuf) { - x1 =3D src->dmabuf->x; - y1 =3D src->dmabuf->y; - w =3D src->dmabuf->width; - h =3D src->dmabuf->height; + x1 =3D dpy_gl_qemu_dmabuf_get_x(src->dmabuf); + y1 =3D dpy_gl_qemu_dmabuf_get_y(src->dmabuf); + w =3D dpy_gl_qemu_dmabuf_get_width(src->dmabuf); + h =3D dpy_gl_qemu_dmabuf_get_height(src->dmabuf); } =20 w =3D (x1 + w) > src->width ? src->width - x1 : w; @@ -308,30 +308,33 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) EGLImageKHR image =3D EGL_NO_IMAGE_KHR; EGLint attrs[64]; int i =3D 0; + uint64_t modifier; + uint32_t texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); =20 - if (dmabuf->texture !=3D 0) { + if (texture !=3D 0) { return; } =20 attrs[i++] =3D EGL_WIDTH; - attrs[i++] =3D dmabuf->backing_width; + attrs[i++] =3D dpy_gl_qemu_dmabuf_get_backing_width(dmabuf); attrs[i++] =3D EGL_HEIGHT; - attrs[i++] =3D dmabuf->backing_height; + attrs[i++] =3D dpy_gl_qemu_dmabuf_get_backing_height(dmabuf); attrs[i++] =3D EGL_LINUX_DRM_FOURCC_EXT; - attrs[i++] =3D dmabuf->fourcc; + attrs[i++] =3D dpy_gl_qemu_dmabuf_get_fourcc(dmabuf); =20 attrs[i++] =3D EGL_DMA_BUF_PLANE0_FD_EXT; - attrs[i++] =3D dmabuf->fd; + attrs[i++] =3D dpy_gl_qemu_dmabuf_get_fd(dmabuf); attrs[i++] =3D EGL_DMA_BUF_PLANE0_PITCH_EXT; - attrs[i++] =3D dmabuf->stride; + attrs[i++] =3D dpy_gl_qemu_dmabuf_get_stride(dmabuf); attrs[i++] =3D EGL_DMA_BUF_PLANE0_OFFSET_EXT; attrs[i++] =3D 0; #ifdef EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT - if (dmabuf->modifier) { + modifier =3D dpy_gl_qemu_dmabuf_get_modifier(dmabuf); + if (modifier) { attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT; - attrs[i++] =3D (dmabuf->modifier >> 0) & 0xffffffff; + attrs[i++] =3D (modifier >> 0) & 0xffffffff; attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT; - attrs[i++] =3D (dmabuf->modifier >> 32) & 0xffffffff; + attrs[i++] =3D (modifier >> 32) & 0xffffffff; } #endif attrs[i++] =3D EGL_NONE; @@ -346,7 +349,8 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) } =20 glGenTextures(1, &dmabuf->texture); - glBindTexture(GL_TEXTURE_2D, dmabuf->texture); + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + glBindTexture(GL_TEXTURE_2D, texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); =20 @@ -356,11 +360,14 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) =20 void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf) { - if (dmabuf->texture =3D=3D 0) { + uint32_t texture; + + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (texture =3D=3D 0) { return; } =20 - glDeleteTextures(1, &dmabuf->texture); + glDeleteTextures(1, &texture); dmabuf->texture =3D 0; } =20 @@ -382,10 +389,12 @@ void egl_dmabuf_create_sync(QemuDmaBuf *dmabuf) =20 void egl_dmabuf_create_fence(QemuDmaBuf *dmabuf) { - if (dmabuf->sync) { + void *sync =3D dpy_gl_qemu_dmabuf_get_sync(dmabuf); + + if (sync) { dmabuf->fence_fd =3D eglDupNativeFenceFDANDROID(qemu_egl_display, - dmabuf->sync); - eglDestroySyncKHR(qemu_egl_display, dmabuf->sync); + sync); + eglDestroySyncKHR(qemu_egl_display, sync); dmabuf->sync =3D NULL; } } diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index 3af5ac5bcf..c9469af9ed 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -70,6 +70,7 @@ void gd_egl_draw(VirtualConsole *vc) QemuDmaBuf *dmabuf =3D vc->gfx.guest_fb.dmabuf; #endif int ww, wh, ws; + int fence_fd; =20 if (!vc->gfx.gls) { return; @@ -83,7 +84,7 @@ void gd_egl_draw(VirtualConsole *vc) if (vc->gfx.scanout_mode) { #ifdef CONFIG_GBM if (dmabuf) { - if (!dmabuf->draw_submitted) { + if (!dpy_gl_qemu_dmabuf_get_draw_submitted(dmabuf)) { return; } else { dmabuf->draw_submitted =3D false; @@ -99,8 +100,9 @@ void gd_egl_draw(VirtualConsole *vc) #ifdef CONFIG_GBM if (dmabuf) { egl_dmabuf_create_fence(dmabuf); - if (dmabuf->fence_fd > 0) { - qemu_set_fd_handler(dmabuf->fence_fd, gd_hw_gl_flushed, NU= LL, vc); + fence_fd =3D dpy_gl_qemu_dmabuf_get_fence_fd(dmabuf); + if (fence_fd > 0) { + qemu_set_fd_handler(fence_fd, gd_hw_gl_flushed, NULL, vc); return; } graphic_hw_gl_block(vc->gfx.dcl.con, false); @@ -149,7 +151,8 @@ void gd_egl_refresh(DisplayChangeListener *dcl) gd_update_monitor_refresh_rate( vc, vc->window ? vc->window : vc->gfx.drawing_area); =20 - if (vc->gfx.guest_fb.dmabuf && vc->gfx.guest_fb.dmabuf->draw_submitted= ) { + if (vc->gfx.guest_fb.dmabuf && + dpy_gl_qemu_dmabuf_get_draw_submitted(vc->gfx.guest_fb.dmabuf)) { return; } =20 @@ -264,22 +267,30 @@ void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, { #ifdef CONFIG_GBM VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); + uint32_t x, y, width, height, backing_width, backing_height, texture; + bool y0_top; =20 eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, vc->gfx.esurface, vc->gfx.ectx); =20 egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (!texture) { return; } =20 - gd_egl_scanout_texture(dcl, dmabuf->texture, - dmabuf->y0_top, - dmabuf->backing_width, dmabuf->backing_height, - dmabuf->x, dmabuf->y, dmabuf->width, - dmabuf->height, NULL); + x =3D dpy_gl_qemu_dmabuf_get_x(dmabuf); + y =3D dpy_gl_qemu_dmabuf_get_y(dmabuf); + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + backing_width =3D dpy_gl_qemu_dmabuf_get_backing_width(dmabuf); + backing_height =3D dpy_gl_qemu_dmabuf_get_backing_height(dmabuf); + y0_top =3D dpy_gl_qemu_dmabuf_get_y0_top(dmabuf); =20 - if (dmabuf->allow_fences) { + gd_egl_scanout_texture(dcl, texture, y0_top, backing_width, backing_he= ight, + x, y, width, height, NULL); + + if (dpy_gl_qemu_dmabuf_get_allow_fences(dmabuf)) { vc->gfx.guest_fb.dmabuf =3D dmabuf; } #endif @@ -291,15 +302,19 @@ void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl, { #ifdef CONFIG_GBM VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); + uint32_t backing_width, backing_height, texture; =20 if (dmabuf) { egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (!texture) { return; } - egl_fb_setup_for_tex(&vc->gfx.cursor_fb, - dmabuf->backing_width, dmabuf->backing_height, - dmabuf->texture, false); + + backing_width =3D dpy_gl_qemu_dmabuf_get_backing_width(dmabuf); + backing_height =3D dpy_gl_qemu_dmabuf_get_backing_height(dmabuf); + egl_fb_setup_for_tex(&vc->gfx.cursor_fb, backing_width, backing_he= ight, + texture, false); } else { egl_fb_destroy(&vc->gfx.cursor_fb); } @@ -363,7 +378,8 @@ void gd_egl_flush(DisplayChangeListener *dcl, VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); GtkWidget *area =3D vc->gfx.drawing_area; =20 - if (vc->gfx.guest_fb.dmabuf && !vc->gfx.guest_fb.dmabuf->draw_submitte= d) { + if (vc->gfx.guest_fb.dmabuf && + !dpy_gl_qemu_dmabuf_get_draw_submitted(vc->gfx.guest_fb.dmabuf)) { graphic_hw_gl_block(vc->gfx.dcl.con, true); vc->gfx.guest_fb.dmabuf->draw_submitted =3D true; gtk_egl_set_scanout_mode(vc, true); diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index 52dcac161e..193862ecc2 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -60,7 +60,7 @@ void gd_gl_area_draw(VirtualConsole *vc) =20 #ifdef CONFIG_GBM if (dmabuf) { - if (!dmabuf->draw_submitted) { + if (!dpy_gl_qemu_dmabuf_get_draw_submitted(dmabuf)) { return; } else { dmabuf->draw_submitted =3D false; @@ -85,9 +85,11 @@ void gd_gl_area_draw(VirtualConsole *vc) glFlush(); #ifdef CONFIG_GBM if (dmabuf) { + int fence_fd; egl_dmabuf_create_fence(dmabuf); - if (dmabuf->fence_fd > 0) { - qemu_set_fd_handler(dmabuf->fence_fd, gd_hw_gl_flushed, NU= LL, vc); + fence_fd =3D dpy_gl_qemu_dmabuf_get_fence_fd(dmabuf); + if (fence_fd > 0) { + qemu_set_fd_handler(fence_fd, gd_hw_gl_flushed, NULL, vc); return; } graphic_hw_gl_block(vc->gfx.dcl.con, false); @@ -125,7 +127,8 @@ void gd_gl_area_refresh(DisplayChangeListener *dcl) =20 gd_update_monitor_refresh_rate(vc, vc->window ? vc->window : vc->gfx.d= rawing_area); =20 - if (vc->gfx.guest_fb.dmabuf && vc->gfx.guest_fb.dmabuf->draw_submitted= ) { + if (vc->gfx.guest_fb.dmabuf && + dpy_gl_qemu_dmabuf_get_draw_submitted(vc->gfx.guest_fb.dmabuf)) { return; } =20 @@ -285,7 +288,8 @@ void gd_gl_area_scanout_flush(DisplayChangeListener *dc= l, { VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); =20 - if (vc->gfx.guest_fb.dmabuf && !vc->gfx.guest_fb.dmabuf->draw_submitte= d) { + if (vc->gfx.guest_fb.dmabuf && + !dpy_gl_qemu_dmabuf_get_draw_submitted(vc->gfx.guest_fb.dmabuf)) { graphic_hw_gl_block(vc->gfx.dcl.con, true); vc->gfx.guest_fb.dmabuf->draw_submitted =3D true; gtk_gl_area_set_scanout_mode(vc, true); @@ -298,20 +302,29 @@ void gd_gl_area_scanout_dmabuf(DisplayChangeListener = *dcl, { #ifdef CONFIG_GBM VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); + uint32_t x, y, width, height, backing_width, backing_height, texture; + bool y0_top; =20 gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area)); egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + if (!texture) { return; } =20 - gd_gl_area_scanout_texture(dcl, dmabuf->texture, - dmabuf->y0_top, - dmabuf->backing_width, dmabuf->backing_heig= ht, - dmabuf->x, dmabuf->y, dmabuf->width, - dmabuf->height, NULL); + x =3D dpy_gl_qemu_dmabuf_get_x(dmabuf); + y =3D dpy_gl_qemu_dmabuf_get_y(dmabuf); + width =3D dpy_gl_qemu_dmabuf_get_width(dmabuf); + height =3D dpy_gl_qemu_dmabuf_get_height(dmabuf); + backing_width =3D dpy_gl_qemu_dmabuf_get_backing_width(dmabuf); + backing_height =3D dpy_gl_qemu_dmabuf_get_backing_height(dmabuf); + y0_top =3D dpy_gl_qemu_dmabuf_get_y0_top(dmabuf); =20 - if (dmabuf->allow_fences) { + gd_gl_area_scanout_texture(dcl, texture, y0_top, + backing_width, backing_height, + x, y, width, height, NULL); + + if (dpy_gl_qemu_dmabuf_get_allow_fences(dmabuf)) { vc->gfx.guest_fb.dmabuf =3D dmabuf; } #endif diff --git a/ui/gtk.c b/ui/gtk.c index 810d7fc796..2c054a42ba 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -596,9 +596,11 @@ void gd_hw_gl_flushed(void *vcon) { VirtualConsole *vc =3D vcon; QemuDmaBuf *dmabuf =3D vc->gfx.guest_fb.dmabuf; + int fence_fd; =20 - qemu_set_fd_handler(dmabuf->fence_fd, NULL, NULL, NULL); - close(dmabuf->fence_fd); + fence_fd =3D dpy_gl_qemu_dmabuf_get_fence_fd(dmabuf); + qemu_set_fd_handler(fence_fd, NULL, NULL, NULL); + close(fence_fd); dmabuf->fence_fd =3D -1; graphic_hw_gl_block(vc->gfx.dcl.con, false); } diff --git a/ui/spice-display.c b/ui/spice-display.c index 6eb98a5a5c..fe49e910a0 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -976,6 +976,7 @@ static void qemu_spice_gl_cursor_dmabuf(DisplayChangeLi= stener *dcl, uint32_t hot_x, uint32_t hot_y) { SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); + uint32_t width, height, texture; =20 ssd->have_hot =3D have_hot; ssd->hot_x =3D hot_x; @@ -984,11 +985,13 @@ static void qemu_spice_gl_cursor_dmabuf(DisplayChange= Listener *dcl, trace_qemu_spice_gl_cursor(ssd->qxl.id, dmabuf !=3D NULL, have_hot); if (dmabuf) { egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_dmabuf_get_texture(dmabuf); + if (!texture) { return; } - egl_fb_setup_for_tex(&ssd->cursor_fb, dmabuf->width, dmabuf->heigh= t, - dmabuf->texture, false); + width =3D dpy_gl_dmabuf_get_width(dmabuf); + height =3D dpy_gl_dmabuf_get_height(dmabuf); + egl_fb_setup_for_tex(&ssd->cursor_fb, width, height, texture, fals= e); } else { egl_fb_destroy(&ssd->cursor_fb); } @@ -1026,6 +1029,7 @@ static void qemu_spice_gl_update(DisplayChangeListene= r *dcl, bool y_0_top =3D false; /* FIXME */ uint64_t cookie; int fd; + uint32_t width, height, texture; =20 if (!ssd->have_scanout) { return; @@ -1042,41 +1046,45 @@ static void qemu_spice_gl_update(DisplayChangeListe= ner *dcl, =20 if (ssd->guest_dmabuf_refresh) { QemuDmaBuf *dmabuf =3D ssd->guest_dmabuf; + width =3D dpy_gl_dmabuf_get_width(dmabuf); + height =3D dpy_gl_dmabuf_get_height(dmabuf); + if (render_cursor) { egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { + texture =3D dpy_gl_dmabuf_get_texture(dmabuf); + if (!texture) { return; } =20 /* source framebuffer */ - egl_fb_setup_for_tex(&ssd->guest_fb, - dmabuf->width, dmabuf->height, - dmabuf->texture, false); + egl_fb_setup_for_tex(&ssd->guest_fb, width, height, + texture, false); =20 /* dest framebuffer */ - if (ssd->blit_fb.width !=3D dmabuf->width || - ssd->blit_fb.height !=3D dmabuf->height) { - trace_qemu_spice_gl_render_dmabuf(ssd->qxl.id, dmabuf->wid= th, - dmabuf->height); + if (ssd->blit_fb.width !=3D width || + ssd->blit_fb.height !=3D height) { + trace_qemu_spice_gl_render_dmabuf(ssd->qxl.id, width, + height); egl_fb_destroy(&ssd->blit_fb); egl_fb_setup_new_tex(&ssd->blit_fb, - dmabuf->width, dmabuf->height); + width, height); fd =3D egl_get_fd_for_texture(ssd->blit_fb.texture, &stride, &fourcc, NULL); - spice_qxl_gl_scanout(&ssd->qxl, fd, - dmabuf->width, dmabuf->height, + spice_qxl_gl_scanout(&ssd->qxl, fd, width, height, stride, fourcc, false); } } else { - trace_qemu_spice_gl_forward_dmabuf(ssd->qxl.id, - dmabuf->width, dmabuf->heig= ht); + int stride =3D dpy_gl_dmabuf_get_stride(dmabuf); + int fourcc =3D dpy_gl_dmabuf_get_fourcc(dmabuf); + int y0top =3D dpy_gl_dmabuf_get_y0top(dmabuf); + int fd =3D dpy_gl_dmabuf_get_fd(dmabuf); + + trace_qemu_spice_gl_forward_dmabuf(ssd->qxl.id, width, height); /* note: spice server will close the fd, so hand over a dup */ - spice_qxl_gl_scanout(&ssd->qxl, dup(dmabuf->fd), - dmabuf->width, dmabuf->height, - dmabuf->stride, dmabuf->fourcc, - dmabuf->y0_top); + spice_qxl_gl_scanout(&ssd->qxl, dup(fd), width, height, + stride, fourcc, y0top); } - qemu_spice_gl_monitor_config(ssd, 0, 0, dmabuf->width, dmabuf->hei= ght); + qemu_spice_gl_monitor_config(ssd, 0, 0, width, height); ssd->guest_dmabuf_refresh =3D false; } =20 --=20 2.34.1 From nobody Thu May 16 14:04:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1713222761; cv=none; d=zohomail.com; s=zohoarc; b=THKMmVJKhDMd56+6iDcJrH5c8EfMaqm/rGj4HEUwzlAFyO5wajdihT/9nBJ7gEsJc5QG9kbMcl69sxmMEwWKKG22u6dh6p39Cta15zaYhJ3MmhaQJ1jDHogqd6BOPV1zjKGvYRb05S3dtOECTfBFj9Eik64cbE8jYDHhqsNY+YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713222761; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=w+TMWppPSMYH9jCLVtBjrWCjk6YM5WWUXBFgQCL5QFA=; b=PVyak9Q04o66CsgweDRvuP3jPzd1b5UsNgsZhb1x5DHseU5vnK2lolAXIdi8/0GpEwr2NGiiv3L0OKme8ILsuu1Ml84C76rG6FDloOLQm6GHl0d9cE/PeiQh6m+6PI4k3+PK69nvKFaoBpX93qi1rAeXzV74Oc1c/e8MN5KPNow= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713222761397418.9383227518056; Mon, 15 Apr 2024 16:12:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwVUJ-0004jQ-Lp; Mon, 15 Apr 2024 19:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwVUF-0004iW-5H for qemu-devel@nongnu.org; Mon, 15 Apr 2024 19:11:43 -0400 Received: from mgamail.intel.com ([192.198.163.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwVUC-0004RA-WF for qemu-devel@nongnu.org; Mon, 15 Apr 2024 19:11:42 -0400 Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:11:34 -0700 Received: from dongwonk-z390-aorus-ultra.fm.intel.com ([10.105.129.124]) by fmviesa004.fm.intel.com with ESMTP; 15 Apr 2024 16:11:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713222701; x=1744758701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VUF4uTVHQQwcIgc2IkzWhuF4P13jR1cs03eo4A3sTeE=; b=XhBsneQDrvEBDj0TFgDT1EyQM9fOU3QVdZzTzfRX9YN+t5CmUKU8L4vn zgNZpa5U2tzIeS4Sq9mbNVU/X4F5XkXZbV9NMcoyVMDNrnvp5jeW1M08t EwLSn5Vrgr+K0yLmjwgRRNurggekntuxtj62vX0eIX6udhRlbOYbRhzqt 4ibfFg3JQ0Qd9Ng4vNH/q1NJgvgld0PeuHvRtLIDo7fa2bALMKRdk/hLb jgcXT/iaz9RnD8bMwmHE37O2Im2iNJ0xj1gRfrxJsdEYyGG9fdzd1wAyN FVJfgx/08brEiWKfit3CaN6SBwa0yD9Y0CuQ+GKXRY16LCXMX/hW4Megy w==; X-CSE-ConnectionGUID: kwEsjE2aTkibFSk/B1unBA== X-CSE-MsgGUID: wbdjka2BSg+lsqX3T48pZg== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="19242740" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="19242740" X-CSE-ConnectionGUID: Puc8Pn0STWKQkADPz5sVug== X-CSE-MsgGUID: pSkTw3TZRf+NJgNjECYFnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="26726946" From: dongwon.kim@intel.com To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com Subject: [PATCH v5 2/3] ui/console: Introduce dpy_gl_qemu_dmabuf_set_..() helpers Date: Mon, 15 Apr 2024 16:07:23 -0700 Message-Id: <20240415230724.9573-3-dongwon.kim@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415230724.9573-1-dongwon.kim@intel.com> References: <20240415230724.9573-1-dongwon.kim@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.11; envelope-from=dongwon.kim@intel.com; helo=mgamail.intel.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.185, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1713222762701100001 From: Dongwon Kim To enhance security in accessing the QemuDmaBuf struct, new helper functions for setting specific fields within the struct were introduced. And all occurrences where these fields were previously set directly have been updated to utilize these helper functions. Suggested-by: Marc-Andr=C3=A9 Lureau Cc: Philippe Mathieu-Daud=C3=A9 Cc: Vivek Kasireddy Signed-off-by: Dongwon Kim --- include/ui/console.h | 5 +++++ ui/console.c | 30 ++++++++++++++++++++++++++++++ ui/egl-helpers.c | 16 +++++++++------- ui/gtk-egl.c | 4 ++-- ui/gtk-gl-area.c | 4 ++-- ui/gtk.c | 2 +- 6 files changed, 49 insertions(+), 12 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 6292943a82..3d9d8b9fce 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -375,6 +375,11 @@ void *dpy_gl_qemu_dmabuf_get_sync(QemuDmaBuf *dmabuf); int32_t dpy_gl_qemu_dmabuf_get_fence_fd(QemuDmaBuf *dmabuf); bool dpy_gl_qemu_dmabuf_get_allow_fences(QemuDmaBuf *dmabuf); bool dpy_gl_qemu_dmabuf_get_draw_submitted(QemuDmaBuf *dmabuf); +void dpy_gl_qemu_dmabuf_set_texture(QemuDmaBuf *dmabuf, uint32_t texture); +void dpy_gl_qemu_dmabuf_set_fence_fd(QemuDmaBuf *dmabuf, int32_t fence_fd); +void dpy_gl_qemu_dmabuf_set_sync(QemuDmaBuf *dmabuf, void *sync); +void dpy_gl_qemu_dmabuf_set_draw_submitted(QemuDmaBuf *dmabuf, bool draw_s= ubmitted); +void dpy_gl_qemu_dmabuf_set_fd(QemuDmaBuf *dmabuf, int32_t fd); void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf); void dpy_gl_update(QemuConsole *con, diff --git a/ui/console.c b/ui/console.c index 5d5635f783..d4ca9e6e0f 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1244,6 +1244,36 @@ bool dpy_gl_qemu_dmabuf_get_draw_submitted(QemuDmaBu= f *dmabuf) return dmabuf->draw_submitted; } =20 +void dpy_gl_qemu_dmabuf_set_texture(QemuDmaBuf *dmabuf, uint32_t texture) +{ + assert(dmabuf !=3D NULL); + dmabuf->texture =3D texture; +} + +void dpy_gl_qemu_dmabuf_set_fence_fd(QemuDmaBuf *dmabuf, int32_t fence_fd) +{ + assert(dmabuf !=3D NULL); + dmabuf->fence_fd =3D fence_fd; +} + +void dpy_gl_qemu_dmabuf_set_sync(QemuDmaBuf *dmabuf, void *sync) +{ + assert(dmabuf !=3D NULL); + dmabuf->sync =3D sync; +} + +void dpy_gl_qemu_dmabuf_set_draw_submitted(QemuDmaBuf *dmabuf, bool draw_s= ubmitted) +{ + assert(dmabuf !=3D NULL); + dmabuf->draw_submitted =3D draw_submitted; +} + +void dpy_gl_qemu_dmabuf_set_fd(QemuDmaBuf *dmabuf, int32_t fd) +{ + assert(dmabuf !=3D NULL); + dmabuf->fd =3D fd; +} + void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf) { diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 86d64c68ce..c71a2878c2 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -348,8 +348,8 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) return; } =20 - glGenTextures(1, &dmabuf->texture); - texture =3D dpy_gl_qemu_dmabuf_get_texture(dmabuf); + glGenTextures(1, &texture); + dpy_gl_qemu_dmabuf_set_texture(dmabuf, texture); glBindTexture(GL_TEXTURE_2D, texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -368,7 +368,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf) } =20 glDeleteTextures(1, &texture); - dmabuf->texture =3D 0; + dpy_gl_qemu_dmabuf_set_texture(dmabuf, 0); } =20 void egl_dmabuf_create_sync(QemuDmaBuf *dmabuf) @@ -382,7 +382,7 @@ void egl_dmabuf_create_sync(QemuDmaBuf *dmabuf) sync =3D eglCreateSyncKHR(qemu_egl_display, EGL_SYNC_NATIVE_FENCE_ANDROID, NULL); if (sync !=3D EGL_NO_SYNC_KHR) { - dmabuf->sync =3D sync; + dpy_gl_qemu_dmabuf_set_sync(dmabuf, sync); } } } @@ -390,12 +390,14 @@ void egl_dmabuf_create_sync(QemuDmaBuf *dmabuf) void egl_dmabuf_create_fence(QemuDmaBuf *dmabuf) { void *sync =3D dpy_gl_qemu_dmabuf_get_sync(dmabuf); + int fence_fd; =20 if (sync) { - dmabuf->fence_fd =3D eglDupNativeFenceFDANDROID(qemu_egl_display, - sync); + fence_fd =3D eglDupNativeFenceFDANDROID(qemu_egl_display, + sync); + dpy_gl_qemu_dmabuf_set_fence_fd(dmabuf, fence_fd); eglDestroySyncKHR(qemu_egl_display, sync); - dmabuf->sync =3D NULL; + dpy_gl_qemu_dmabuf_set_sync(dmabuf, NULL); } } =20 diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index c9469af9ed..7494a34d7c 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -87,7 +87,7 @@ void gd_egl_draw(VirtualConsole *vc) if (!dpy_gl_qemu_dmabuf_get_draw_submitted(dmabuf)) { return; } else { - dmabuf->draw_submitted =3D false; + dpy_gl_qemu_dmabuf_set_draw_submitted(dmabuf, false); } } #endif @@ -381,7 +381,7 @@ void gd_egl_flush(DisplayChangeListener *dcl, if (vc->gfx.guest_fb.dmabuf && !dpy_gl_qemu_dmabuf_get_draw_submitted(vc->gfx.guest_fb.dmabuf)) { graphic_hw_gl_block(vc->gfx.dcl.con, true); - vc->gfx.guest_fb.dmabuf->draw_submitted =3D true; + dpy_gl_qemu_dmabuf_set_draw_submitted(vc->gfx.guest_fb.dmabuf, tru= e); gtk_egl_set_scanout_mode(vc, true); gtk_widget_queue_draw_area(area, x, y, w, h); return; diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index 193862ecc2..26b9689a5f 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -63,7 +63,7 @@ void gd_gl_area_draw(VirtualConsole *vc) if (!dpy_gl_qemu_dmabuf_get_draw_submitted(dmabuf)) { return; } else { - dmabuf->draw_submitted =3D false; + dpy_gl_qemu_dmabuf_set_draw_submitted(dmabuf, false); } } #endif @@ -291,7 +291,7 @@ void gd_gl_area_scanout_flush(DisplayChangeListener *dc= l, if (vc->gfx.guest_fb.dmabuf && !dpy_gl_qemu_dmabuf_get_draw_submitted(vc->gfx.guest_fb.dmabuf)) { graphic_hw_gl_block(vc->gfx.dcl.con, true); - vc->gfx.guest_fb.dmabuf->draw_submitted =3D true; + dpy_gl_qemu_dmabuf_set_draw_submitted(vc->gfx.guest_fb.dmabuf, tru= e); gtk_gl_area_set_scanout_mode(vc, true); } gtk_gl_area_queue_render(GTK_GL_AREA(vc->gfx.drawing_area)); diff --git a/ui/gtk.c b/ui/gtk.c index 2c054a42ba..b6a1f6f897 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -601,7 +601,7 @@ void gd_hw_gl_flushed(void *vcon) fence_fd =3D dpy_gl_qemu_dmabuf_get_fence_fd(dmabuf); qemu_set_fd_handler(fence_fd, NULL, NULL, NULL); close(fence_fd); - dmabuf->fence_fd =3D -1; + dpy_gl_qemu_dmabuf_set_fence_fd(dmabuf, -1); graphic_hw_gl_block(vc->gfx.dcl.con, false); } =20 --=20 2.34.1 From nobody Thu May 16 14:04:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1713222761; cv=none; d=zohomail.com; s=zohoarc; b=EjTPex5vS8G+TezJirveJG6mh+JeZg048R8B+sJkelzoYlbI1o12lDBR+9uhwnquHRN59TkyDpN4gdSCb42KMVsvGX70mM7XzaWLwreA7oy9cwwRx/FMYQG7wSIiR3eM21zh7e6HP+u046a148Muy+CSboYpaSmcPuBJq4psds8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713222761; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MfiwmOAR5jfQqfC2/P6silrFLgcW4NQJR/D9TTwIeXI=; b=PAAdeUO+ZJDls5cX7knteDon2uKOFuOhFPd8IMAWKkaaQa6zwRH0PjP4bfOsT/XgT+l+4tkwVjz8KqwBuN/fSNTREy7IY1P+XH7JOVaRezLZakKMpRbHT7s2XSHjHu/8/iwtZ0li7GZVKDdY7XUJtbiKhSnHpjO5DwWxxws2v4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713222761510864.0289967885797; Mon, 15 Apr 2024 16:12:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwVUL-0004jy-Q2; Mon, 15 Apr 2024 19:11:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwVUI-0004jB-Ul for qemu-devel@nongnu.org; Mon, 15 Apr 2024 19:11:46 -0400 Received: from mgamail.intel.com ([192.198.163.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwVUF-0004RA-Ff for qemu-devel@nongnu.org; Mon, 15 Apr 2024 19:11:46 -0400 Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:11:34 -0700 Received: from dongwonk-z390-aorus-ultra.fm.intel.com ([10.105.129.124]) by fmviesa004.fm.intel.com with ESMTP; 15 Apr 2024 16:11:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713222703; x=1744758703; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RT/BH3qg8Jmw7tZPJXCSDX0TBSe2uO95fK+KjIqEghc=; b=G03nzcQZ/YWW/6vEAgvNzP0WVpm7PgnzdDsHTuJL2FTjihwTr8fKhIUg Jf8i8hSd3FGGXSg/9AzW99zjNLmOHrEIP1RduS6kUPSjuLQDk1gkf9iIT BJxHdx8xvLBPMLiE2CRuUYObXUjd2LVxO6jbuua4sGpGPzOIifvpH1OGs 3d14Z74NNSPEHzdKlozBlUaGqBW+xLi0vcJbaDp4DBUDtBvsg/IPPRfvL F2F7uRGAUTPZK4Ac8Pcvv7jy3xJX17EdmLpxvbdBURuSPzy9nTdb5LWrX SQ1JNEPNRD2NOsXiakQPcu7GuIC1tw0gTM4ymzkfjShNAFIn9IM5ToXei w==; X-CSE-ConnectionGUID: /knTYCmiQFegA0vHsjLR2w== X-CSE-MsgGUID: zSzrmf/7Scmb7ohlFP3Q2w== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="19242742" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="19242742" X-CSE-ConnectionGUID: y4TSK2uzToCFm38DCrNvWg== X-CSE-MsgGUID: 52iVSm59SZezrDQ5lv2G0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="26726947" From: dongwon.kim@intel.com To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com Subject: [PATCH v5 3/3] ui/console: Introduce dpy_gl_qemu_dmabuf_new() and free() helpers Date: Mon, 15 Apr 2024 16:07:24 -0700 Message-Id: <20240415230724.9573-4-dongwon.kim@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415230724.9573-1-dongwon.kim@intel.com> References: <20240415230724.9573-1-dongwon.kim@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.11; envelope-from=dongwon.kim@intel.com; helo=mgamail.intel.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.185, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1713222762760100008 From: Dongwon Kim This commit introduces utility functions for the creation and deallocation of QemuDmaBuf instances. Additionally, it updates all relevant sections of the codebase to utilize these new utility functions. Suggested-by: Marc-Andr=C3=A9 Lureau Cc: Philippe Mathieu-Daud=C3=A9 Cc: Vivek Kasireddy Signed-off-by: Dongwon Kim --- include/hw/vfio/vfio-common.h | 2 +- include/hw/virtio/virtio-gpu.h | 4 ++-- include/ui/console.h | 8 +++++++- hw/display/vhost-user-gpu.c | 32 +++++++++++++++++-------------- hw/display/virtio-gpu-udmabuf.c | 24 +++++++++-------------- hw/vfio/display.c | 26 ++++++++++++------------- ui/console.c | 34 +++++++++++++++++++++++++++++++++ ui/dbus-listener.c | 28 ++++++++++++--------------- 8 files changed, 95 insertions(+), 63 deletions(-) diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index b9da6c08ef..d66e27db02 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -148,7 +148,7 @@ typedef struct VFIOGroup { } VFIOGroup; =20 typedef struct VFIODMABuf { - QemuDmaBuf buf; + QemuDmaBuf *buf; uint32_t pos_x, pos_y, pos_updates; uint32_t hot_x, hot_y, hot_updates; int dmabuf_id; diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index ed44cdad6b..56d6e821bf 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -169,7 +169,7 @@ struct VirtIOGPUBaseClass { DEFINE_PROP_UINT32("yres", _state, _conf.yres, 800) =20 typedef struct VGPUDMABuf { - QemuDmaBuf buf; + QemuDmaBuf *buf; uint32_t scanout_id; QTAILQ_ENTRY(VGPUDMABuf) next; } VGPUDMABuf; @@ -238,7 +238,7 @@ struct VhostUserGPU { VhostUserBackend *vhost; int vhost_gpu_fd; /* closed by the chardev */ CharBackend vhost_chr; - QemuDmaBuf dmabuf[VIRTIO_GPU_MAX_SCANOUTS]; + QemuDmaBuf *dmabuf[VIRTIO_GPU_MAX_SCANOUTS]; bool backend_blocked; }; =20 diff --git a/include/ui/console.h b/include/ui/console.h index 3d9d8b9fce..6d7c03b7c5 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -358,7 +358,13 @@ void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf= *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y); void dpy_gl_cursor_position(QemuConsole *con, uint32_t pos_x, uint32_t pos_y); - +QemuDmaBuf *dpy_gl_qemu_dmabuf_new(uint32_t width, uint32_t height, + uint32_t stride, uint32_t x, + uint32_t y, uint32_t backing_width, + uint32_t backing_height, uint32_t fourc= c, + uint64_t modifier, uint32_t dmabuf_fd, + bool allow_fences, bool y0_top); +void dpy_gl_qemu_dmabuf_free(QemuDmaBuf *dmabuf); int32_t dpy_gl_qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf); uint32_t dpy_gl_qemu_dmabuf_get_width(QemuDmaBuf *dmabuf); uint32_t dpy_gl_qemu_dmabuf_get_height(QemuDmaBuf *dmabuf); diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 87dcfbca10..4d8461e94a 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -250,6 +250,7 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) VhostUserGpuDMABUFScanout *m =3D &msg->payload.dmabuf_scanout; int fd =3D qemu_chr_fe_get_msgfd(&g->vhost_chr); int old_fd; + uint64_t modifier =3D 0; QemuDmaBuf *dmabuf; =20 if (m->scanout_id >=3D g->parent_obj.conf.max_outputs) { @@ -262,31 +263,34 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostU= serGpuMsg *msg) =20 g->parent_obj.enable =3D 1; con =3D g->parent_obj.scanout[m->scanout_id].con; - dmabuf =3D &g->dmabuf[m->scanout_id]; - old_fd =3D dpy_gl_qemu_dmabuf_get_fd(dmabuf); - if (old_fd >=3D 0) { - close(old_fd); - dmabuf->fd =3D -1; + dmabuf =3D g->dmabuf[m->scanout_id]; + if (dmabuf) { + old_fd =3D dpy_gl_qemu_dmabuf_get_fd(dmabuf); + if (old_fd >=3D 0) { + close(old_fd); + dpy_gl_qemu_dmabuf_set_fd(dmabuf, -1); + } } dpy_gl_release_dmabuf(con, dmabuf); + g_clear_pointer(&dmabuf, dpy_gl_qemu_dmabuf_free); if (fd =3D=3D -1) { dpy_gl_scanout_disable(con); break; } - *dmabuf =3D (QemuDmaBuf) { - .fd =3D fd, - .width =3D m->fd_width, - .height =3D m->fd_height, - .stride =3D m->fd_stride, - .fourcc =3D m->fd_drm_fourcc, - .y0_top =3D m->fd_flags & VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP, - }; + if (msg->request =3D=3D VHOST_USER_GPU_DMABUF_SCANOUT2) { VhostUserGpuDMABUFScanout2 *m2 =3D &msg->payload.dmabuf_scanou= t2; - dmabuf->modifier =3D m2->modifier; + modifier =3D m2->modifier; } =20 + dmabuf =3D dpy_gl_qemu_dmabuf_new(m->fd_width, m->fd_height, + m->fd_stride, 0, 0, 0, 0, + m->fd_drm_fourcc, modifier, + fd, false, m->fd_flags & + VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP); + dpy_gl_scanout_dmabuf(con, dmabuf); + g->dmabuf[m->scanout_id] =3D dmabuf; break; } case VHOST_USER_GPU_DMABUF_UPDATE: { diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index e3f358b575..79eafc7289 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -162,7 +162,8 @@ static void virtio_gpu_free_dmabuf(VirtIOGPU *g, VGPUDM= ABuf *dmabuf) struct virtio_gpu_scanout *scanout; =20 scanout =3D &g->parent_obj.scanout[dmabuf->scanout_id]; - dpy_gl_release_dmabuf(scanout->con, &dmabuf->buf); + dpy_gl_release_dmabuf(scanout->con, dmabuf->buf); + g_clear_pointer(&dmabuf->buf, dpy_gl_qemu_dmabuf_free); QTAILQ_REMOVE(&g->dmabuf.bufs, dmabuf, next); g_free(dmabuf); } @@ -181,17 +182,10 @@ static VGPUDMABuf } =20 dmabuf =3D g_new0(VGPUDMABuf, 1); - dmabuf->buf.width =3D r->width; - dmabuf->buf.height =3D r->height; - dmabuf->buf.stride =3D fb->stride; - dmabuf->buf.x =3D r->x; - dmabuf->buf.y =3D r->y; - dmabuf->buf.backing_width =3D fb->width; - dmabuf->buf.backing_height =3D fb->height; - dmabuf->buf.fourcc =3D qemu_pixman_to_drm_format(fb->format); - dmabuf->buf.fd =3D res->dmabuf_fd; - dmabuf->buf.allow_fences =3D true; - dmabuf->buf.draw_submitted =3D false; + dmabuf->buf =3D dpy_gl_qemu_dmabuf_new(r->width, r->height, fb->stride, + r->x, r->y, fb->width, fb->height, + qemu_pixman_to_drm_format(fb->for= mat), + 0, res->dmabuf_fd, false, 0); dmabuf->scanout_id =3D scanout_id; QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next); =20 @@ -217,11 +211,11 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, old_primary =3D g->dmabuf.primary[scanout_id]; } =20 - width =3D dpy_gl_qemu_dmabuf_get_width(&new_primary->buf); - height =3D dpy_gl_qemu_dmabuf_get_height(&new_primary->buf); + width =3D dpy_gl_qemu_dmabuf_get_width(new_primary->buf); + height =3D dpy_gl_qemu_dmabuf_get_height(new_primary->buf); g->dmabuf.primary[scanout_id] =3D new_primary; qemu_console_resize(scanout->con, width, height); - dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); + dpy_gl_scanout_dmabuf(scanout->con, new_primary->buf); =20 if (old_primary) { virtio_gpu_free_dmabuf(g, old_primary); diff --git a/hw/vfio/display.c b/hw/vfio/display.c index f9c39cbd51..7e26d9667f 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -241,14 +241,11 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDev= ice *vdev, =20 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.backing_width =3D plane.width; - dmabuf->buf.backing_height =3D plane.height; - dmabuf->buf.stride =3D plane.stride; - dmabuf->buf.fourcc =3D plane.drm_format; - dmabuf->buf.modifier =3D plane.drm_format_mod; - dmabuf->buf.fd =3D fd; + dmabuf->buf =3D dpy_gl_qemu_dmabuf_new(plane.width, plane.height, + plane.stride, 0, 0, plane.width, + plane.height, plane.drm_format, + plane.drm_format_mod, fd, false, = 0); + if (plane_type =3D=3D DRM_PLANE_TYPE_CURSOR) { vfio_display_update_cursor(dmabuf, &plane); } @@ -263,8 +260,9 @@ static void vfio_display_free_one_dmabuf(VFIODisplay *d= py, VFIODMABuf *dmabuf) =20 QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); =20 - fd =3D dpy_gl_qemu_dmabuf_get_fd(&dmabuf->buf); - dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); + fd =3D dpy_gl_qemu_dmabuf_get_fd(dmabuf->buf); + dpy_gl_release_dmabuf(dpy->con, dmabuf->buf); + g_clear_pointer(&dmabuf->buf, dpy_gl_qemu_dmabuf_free); close(fd); g_free(dmabuf); } @@ -301,13 +299,13 @@ static void vfio_display_dmabuf_update(void *opaque) return; } =20 - width =3D dpy_gl_qemu_dmabuf_get_width(&primary->buf); - height =3D dpy_gl_qemu_dmabuf_get_height(&primary->buf); + width =3D dpy_gl_qemu_dmabuf_get_width(primary->buf); + height =3D dpy_gl_qemu_dmabuf_get_height(primary->buf); =20 if (dpy->dmabuf.primary !=3D primary) { dpy->dmabuf.primary =3D primary; qemu_console_resize(dpy->con, width, height); - dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); + dpy_gl_scanout_dmabuf(dpy->con, primary->buf); free_bufs =3D true; } =20 @@ -321,7 +319,7 @@ static void vfio_display_dmabuf_update(void *opaque) if (cursor && (new_cursor || cursor->hot_updates)) { bool have_hot =3D (cursor->hot_x !=3D 0xffffffff && cursor->hot_y !=3D 0xffffffff); - dpy_gl_cursor_dmabuf(dpy->con, &cursor->buf, have_hot, + dpy_gl_cursor_dmabuf(dpy->con, cursor->buf, have_hot, cursor->hot_x, cursor->hot_y); cursor->hot_updates =3D 0; } else if (!cursor && new_cursor) { diff --git a/ui/console.c b/ui/console.c index d4ca9e6e0f..ea23fd8af6 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1132,6 +1132,40 @@ void dpy_gl_cursor_position(QemuConsole *con, } } =20 +QemuDmaBuf *dpy_gl_qemu_dmabuf_new(uint32_t width, uint32_t height, + uint32_t stride, uint32_t x, + uint32_t y, uint32_t backing_width, + uint32_t backing_height, uint32_t fourc= c, + uint64_t modifier, uint32_t dmabuf_fd, + bool allow_fences, bool y0_top) { + QemuDmaBuf *dmabuf; + + dmabuf =3D g_new0(QemuDmaBuf, 1); + + dmabuf->width =3D width; + dmabuf->height =3D height; + dmabuf->stride =3D stride; + dmabuf->x =3D x; + dmabuf->y =3D y; + dmabuf->backing_width =3D backing_width; + dmabuf->backing_height =3D backing_height; + dmabuf->fourcc =3D fourcc; + dmabuf->modifier =3D modifier; + dmabuf->fd =3D dmabuf_fd; + dmabuf->allow_fences =3D allow_fences; + dmabuf->y0_top =3D y0_top; + dmabuf->fence_fd =3D -1; + + return dmabuf; +} + +void dpy_gl_qemu_dmabuf_free(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + g_free(dmabuf); +} + int32_t dpy_gl_qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf) { assert(dmabuf !=3D NULL); diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index c6c7d93753..85d779a45c 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -442,28 +442,24 @@ static void dbus_scanout_texture(DisplayChangeListene= r *dcl, trace_dbus_scanout_texture(tex_id, backing_y_0_top, backing_width, backing_height, x, y, w, h); #ifdef CONFIG_GBM - QemuDmaBuf dmabuf =3D { - .width =3D w, - .height =3D h, - .y0_top =3D backing_y_0_top, - .x =3D x, - .y =3D y, - .backing_width =3D backing_width, - .backing_height =3D backing_height, - }; + int32_t fd; + uint32_t stride, fourcc; + uint64_t modifier; + QemuDmaBuf *dmabuf; =20 assert(tex_id); - dmabuf.fd =3D egl_get_fd_for_texture( - tex_id, (EGLint *)&dmabuf.stride, - (EGLint *)&dmabuf.fourcc, - &dmabuf.modifier); - if (dmabuf.fd < 0) { + fd =3D egl_get_fd_for_texture(tex_id, (EGLint *)&stride, (EGLint *)&fo= urcc, + &modifier); + if (fd < 0) { error_report("%s: failed to get fd for texture", __func__); return; } + dmabuf =3D dpy_gl_qemu_dmabuf_new(w, h, stride, x, y, backing_width, + backing_height, fourcc, modifier, fd, + false, backing_y_0_top); =20 - dbus_scanout_dmabuf(dcl, &dmabuf); - close(dmabuf.fd); + dbus_scanout_dmabuf(dcl, dmabuf); + close(fd); #endif =20 #ifdef WIN32 --=20 2.34.1