From nobody Thu May 16 07:31:19 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=1710906318; cv=none; d=zohomail.com; s=zohoarc; b=fmJhD85WfwtFVd+MxHOW1sXSoibSgdrkWG7CGeBj0Or3bBJDhTuS0E8dFiI83wwEZXFcIGQ4WwJMtcrpHMmNgRSRyD2gp/eKBcjsvLwyR8iZE4GsAYewW07/oQCpLGUtM4M3FX41JrunUjOgzUhF6jnZ24DRHHNsWcfpNDSoUHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710906318; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hsoKHqksRSj466Me1OyZm51EcD3PrPDlhRQj4+yuXHA=; b=JA2W8eJD7C3T05xTD79gXdygw4latvKYpn37itZRMqduzSBCYv2oLlkVA+JQSo2UL6MF+6HE0qbhQqqsdB0mguysoLwyrx4d7tdvUyAk7fBzhm3VszDfZ3K/U8fWgIX0PpTzUHDEuXVZOAVj3ni8Fbprt4oR6uhKnSwuawkDSgU= 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 171090631801038.59544627905757; Tue, 19 Mar 2024 20:45:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmms7-0006oM-IT; Tue, 19 Mar 2024 23:44:11 -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 1rmms5-0006ny-WE for qemu-devel@nongnu.org; Tue, 19 Mar 2024 23:44:10 -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 1rmms3-0003Hk-Ix for qemu-devel@nongnu.org; Tue, 19 Mar 2024 23:44:09 -0400 Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2024 20:44:04 -0700 Received: from dongwonk-z390-aorus-ultra.fm.intel.com ([10.105.129.124]) by fmviesa005.fm.intel.com with ESMTP; 19 Mar 2024 20:44:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710906247; x=1742442247; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=MpapFjGFrONzrS7LJyLdyOHEjYZgtXkLbRb1i7AG8a8=; b=CB0YnthqiZFrXT+mBGKQEDlOYcgduIllBAvF8zJGddHcOHFoBeOoNzaE l9q3+Z47Wf2SgR7lafCKL7oIx/pHhEHWP2p7fU9AcsYsOYTQ9S2to7ULX fpA+j74krggSE3RYZlWmx+Wa5TSjZGDc4z1ztkkc1kuuhs3E5bo84GaEm ZOu7i5Xpxc5qgea3r/w6YqxiLsmrfvlwDxKeMppLdOOnOeDhUBotxd1eU l34JTs22zaKtf6tC2Dh/Z9eoCc0W7oRJnl1TqTbf9zJGJU6iq/pJt6saU Hs79CuR28otc8KzqgrUpgPWA1h1K/Nn6DHiXByuMok2sRDdOd+H204pHL w==; X-IronPort-AV: E=McAfee;i="6600,9927,11018"; a="16456551" X-IronPort-AV: E=Sophos;i="6.07,138,1708416000"; d="scan'208";a="16456551" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,138,1708416000"; d="scan'208";a="18477406" From: dongwon.kim@intel.com To: qemu-devel@nongnu.org Subject: [PATCH] ui/console: initialize QemuDmaBuf from ui/console. Date: Tue, 19 Mar 2024 20:42:29 -0700 Message-Id: <20240320034229.3347130-1-dongwon.kim@intel.com> X-Mailer: git-send-email 2.34.1 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1710906318850100001 From: Dongwon Kim It is safer to create, initialize, and access all the parameters in QemuDmaBuf from a central location, ui/console, instead of hw/virtio-gpu or hw/vfio modules. Cc: Marc-Andr=C3=A9 Lureau Cc: Vivek Kasireddy Signed-off-by: Dongwon Kim --- hw/display/virtio-gpu-udmabuf.c | 27 +++++++--------- hw/vfio/display.c | 35 ++++++++++++--------- include/hw/vfio/vfio-common.h | 2 +- include/hw/virtio/virtio-gpu.h | 2 +- include/ui/console.h | 10 ++++++ ui/console.c | 55 +++++++++++++++++++++++++++++++++ 6 files changed, 98 insertions(+), 33 deletions(-) diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index d51184d658..dde6c8e9d9 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -162,7 +162,7 @@ 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); QTAILQ_REMOVE(&g->dmabuf.bufs, dmabuf, next); g_free(dmabuf); } @@ -181,17 +181,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_create_dmabuf(r->width, r->height, fb->stride, + r->x, r->y, fb->width, fb->height, + qemu_pixman_to_drm_format(fb->forma= t), + 0, res->dmabuf_fd, false); dmabuf->scanout_id =3D scanout_id; QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next); =20 @@ -206,21 +199,23 @@ 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) { return -EINVAL; } =20 + width =3D dpy_gl_dmabuf_get_width(new_primary->buf); + height =3D dpy_gl_dmabuf_get_height(new_primary->buf); + if (g->dmabuf.primary[scanout_id]) { old_primary =3D g->dmabuf.primary[scanout_id]; } =20 g->dmabuf.primary[scanout_id] =3D new_primary; - qemu_console_resize(scanout->con, - new_primary->buf.width, - new_primary->buf.height); - dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); + qemu_console_resize(scanout->con, width, height); + 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 1aa440c663..a3bdb01789 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -241,14 +241,10 @@ 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_create_dmabuf(plane.width, plane.height, plane.= stride, + 0, 0, plane.width, plane.height, + plane.drm_format, plane.drm_format_= mod, + fd, false); if (plane_type =3D=3D DRM_PLANE_TYPE_CURSOR) { vfio_display_update_cursor(dmabuf, &plane); } @@ -259,9 +255,15 @@ 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); - dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); - close(dmabuf->buf.fd); + fd =3D dpy_gl_dmabuf_get_fd(dmabuf->buf); + if (fd > -1) { + close(fd); + } + + dpy_gl_release_dmabuf(dpy->con, dmabuf->buf); g_free(dmabuf); } =20 @@ -286,6 +288,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,11 +299,13 @@ static void vfio_display_dmabuf_update(void *opaque) return; } =20 + width =3D dpy_gl_dmabuf_get_width(primary->buf); + height =3D dpy_gl_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); - dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); + qemu_console_resize(dpy->con, width, height); + dpy_gl_scanout_dmabuf(dpy->con, primary->buf); free_bufs =3D true; } =20 @@ -314,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) { @@ -328,7 +333,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/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..010083e8e3 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; diff --git a/include/ui/console.h b/include/ui/console.h index a4a49ffc64..0b823efb2e 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -279,6 +279,7 @@ typedef struct DisplayChangeListenerOps { /* optional */ void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl, uint32_t pos_x, uint32_t pos_y); + /* optional */ void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf); @@ -358,6 +359,15 @@ 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_create_dmabuf(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 fourcc, + uint32_t modifier, uint32_t dmabuf_fd, + bool allow_fences); +uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf); +int32_t dpy_gl_dmabuf_get_fd(QemuDmaBuf *dmabuf); 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 832055675c..616d636912 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1190,6 +1190,60 @@ void dpy_gl_cursor_position(QemuConsole *con, } } =20 +QemuDmaBuf *dpy_gl_create_dmabuf(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 fourcc, + uint32_t modifier, uint32_t dmabuf_fd, + bool allow_fences) +{ + 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->fence_fd =3D -1; + + return dmabuf; +} + +uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf) +{ + if (dmabuf) { + return dmabuf->width; + } + + return 0; +} + +uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf) +{ + if (dmabuf) { + return dmabuf->height; + } + + return 0; +} + +int32_t dpy_gl_dmabuf_get_fd(QemuDmaBuf *dmabuf) +{ + if (dmabuf) { + return dmabuf->fd; + } + + return -1; +} + void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf) { @@ -1203,6 +1257,7 @@ void dpy_gl_release_dmabuf(QemuConsole *con, if (dcl->ops->dpy_gl_release_dmabuf) { dcl->ops->dpy_gl_release_dmabuf(dcl, dmabuf); } + g_free(dmabuf); } } =20 --=20 2.34.1