From nobody Wed May 15 17:12:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711015650; cv=none; d=zohomail.com; s=zohoarc; b=NuK7phk+1HPyNVtjs3Y4vuPPNIJYCu7hUiM++oChDTxbkuVg0zNtkj+8hzQJCKYCi/rLlYCHhu8pG36rK5X0PR/oP2hWzT0vyiO1txHsNYgUNNDYnnPCsCIPheZ7XtT87Sfyt3gz02pzgZ9xg3Omx/iAI/gmm5KGqQ9iycgwUSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711015650; 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=A2dvM+euMDE0v28D1xjaFlsbAEAYgdfmVYQj+HIsXyM=; b=bGXBDNwCJP1kmdwDt1OOLs+BmraX2mxxkfl5lOpR2ODGN3ZEm2wa78O7FEqwF9tGMUK+MAoqvnmY1XplmfA3MZqFjbjmwvvdkO7SBndpsNbhLMFGKuFboQ7iR39hgstgtmT1vdBOuKGeDAd9wp+qrU/o17kzOcmJaFEogEfRGgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1711015650372863.952322464515; Thu, 21 Mar 2024 03:07:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnFK1-0002kY-VO; Thu, 21 Mar 2024 06:06:54 -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 1rnFJz-0002WM-Ts for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:06:51 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnFJy-0007yO-7T for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:06:51 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2d220e39907so11242871fa.1 for ; Thu, 21 Mar 2024 03:06:49 -0700 (PDT) Received: from localhost.localdomain (10.red-88-29-188.dynamicip.rima-tde.net. [88.29.188.10]) by smtp.gmail.com with ESMTPSA id g14-20020a5d540e000000b0033e95bf4796sm16765659wrv.27.2024.03.21.03.06.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 21 Mar 2024 03:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711015608; x=1711620408; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A2dvM+euMDE0v28D1xjaFlsbAEAYgdfmVYQj+HIsXyM=; b=wD7fkTGSyL1WMoaiQ78jb40GiGEEoBFYzNxfpRvELPg0smw4W1/V9H+e3+7XB5QH1w ceQIkhu7WNwcAPLCZZhySqm3e0X6WKa4PEO7BDdtETvean+lRnJVdVngE2qC6dWlrWPc FqdW4QIYAy84s0hzKLMybu3jP4cnPROyHrvG646RmF7+ic0TYAgNhbwEQ7BQsxT8aHml s9kbiwtj/tlvArmUJYIEXCqe8HUokVpjqejr8X+UQnCfdRAs95eRmTnZ0qFXjbW8p24m +wvumGd9i5d0mJOaGlWUvpsmPJ0N2qt+bv/haB5hiWuPzNXXuqKeLQQ8vX+AgbyNI1QE ucgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711015608; x=1711620408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A2dvM+euMDE0v28D1xjaFlsbAEAYgdfmVYQj+HIsXyM=; b=hp7K82qbPZkfxmfWKw5g9Z97b8K96d8lePjyZUJx87KCYz3znlWWWTTZCxCKh4Eaic pOcnBNA/Kf0sBGjq6DF/zhHm5YP7YAJ8oIjG/46zYwqxVCAxa2keE4EqBKc0kl3o6wWG cHP/q9iFrRiiL+P5J8cmXbHA6YNaTIxhE+zXEZw2gghhtAx5MesepQOZg+O4Uh5RqUuX zvRtHDx/10zv3grUgL1VttFzVa7cNVej4uuRDe5na8qZWKoYCkGQzP60bFKlCwhJQ4JU fauQrvqXPWCPgt/WFPDX0yBNYdHr6fG+Lddr7ysIc+bjMHztFoitCw0lHw3eeirqJCOc WS3g== X-Forwarded-Encrypted: i=1; AJvYcCX03Ay6twpGkhB08gPmUK5mzMjE173ck98SVTj8LogAgl1aY83nUplguruMr5KIvCxr69/tXMK2ovB5XO+dzEwHKBHdC8Q= X-Gm-Message-State: AOJu0YyEPh8BlZbxpxX0l05UPTejr6v+eBE2Vk7FvfKfheEFCV5H3ESL PfVplvGhVS7q3/zaoiOPbpbvQ8u2QRwqPKefe+xrIVYMmNCH55CH85kVs+Qry/s= X-Google-Smtp-Source: AGHT+IGU5M1dD5nFfomSZl4U1vrATCQc2rUAJvLBbC8xtzWFzBKAmm1kRYUV8yV1Rs5WnihURTdX/A== X-Received: by 2002:a2e:8187:0:b0:2d4:5d56:e559 with SMTP id e7-20020a2e8187000000b002d45d56e559mr14298577ljg.47.1711015608437; Thu, 21 Mar 2024 03:06:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Dongwon Kim , qemu-devel@nongnu.org Cc: Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Vivek Kasireddy , "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/3] ui/console: Introduce dpy_gl_dmabuf_get_height/width() helpers Date: Thu, 21 Mar 2024 11:06:33 +0100 Message-ID: <20240321100635.64950-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240321100635.64950-1-philmd@linaro.org> References: <20240321100635.64950-1-philmd@linaro.org> 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=2a00:1450:4864:20::230; envelope-from=philmd@linaro.org; helo=mail-lj1-x230.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 @linaro.org) X-ZM-MESSAGEID: 1711015652649100003 From: Dongwon Kim Signed-off-by: Dongwon Kim Message-Id: <20240320034229.3347130-1-dongwon.kim@intel.com> [PMD: Split patch in 3, part 1/3] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/ui/console.h | 2 ++ hw/display/virtio-gpu-udmabuf.c | 8 +++++--- hw/vfio/display.c | 9 ++++++--- ui/console.c | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index a4a49ffc64..a7f6cef26d 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -358,6 +358,8 @@ 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); +uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf); void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf); void dpy_gl_update(QemuConsole *con, diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index d51184d658..d680e871c1 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -206,20 +206,22 @@ 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); + 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..c962e5f88f 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -286,6 +286,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 +297,12 @@ 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); + qemu_console_resize(dpy->con, width, height); dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); free_bufs =3D true; } @@ -328,7 +331,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 832055675c..edabad64c0 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1190,6 +1190,24 @@ void dpy_gl_cursor_position(QemuConsole *con, } } =20 +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; +} + void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf) { --=20 2.41.0 From nobody Wed May 15 17:12:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711015655; cv=none; d=zohomail.com; s=zohoarc; b=jVYjBwIqU7U3dEmZn5gLQInct/TQNn15bNs2KAwEnREVo6hmttqKTYl3qd89ZlMALhjqD0KnnbJyf4gqc9mKilR8qYinQXTMThsOMFG794V+CGQo6ugx0qQVCYpVY3cTN2pe8W+Y6audvlZlWatMtNQTbfQRrC7zrW9N78ufl34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711015655; 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=hVKhUMPA/lZLPyzQ0H0k/UNNx6M+om6jLRUQuH/VY+g=; b=Ffg06kwNSYNN0mX+UWIYKKibmHsKBDHZXtSVfNxLCO2tXggo9KNDpWk5hHkKyUW91XKpKGm3HrwzDOZWfb0JDcN7CdnOeA/pFrckWXbud6bMI0ZVDokMhNwDjP1gyZqxZesazBJa5HO1yAiOrVI5lEnGa7njORykw/ie959/kMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 17110156556631005.1633926582516; Thu, 21 Mar 2024 03:07:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnFKV-0003uk-6U; Thu, 21 Mar 2024 06:07:23 -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 1rnFK9-0003Zz-72 for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:07:03 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnFK5-0007yd-Sp for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:06:59 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-41400a9844aso10844625e9.0 for ; Thu, 21 Mar 2024 03:06:57 -0700 (PDT) Received: from localhost.localdomain (10.red-88-29-188.dynamicip.rima-tde.net. [88.29.188.10]) by smtp.gmail.com with ESMTPSA id p5-20020a05600c468500b004132ae838absm5096553wmo.43.2024.03.21.03.06.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 21 Mar 2024 03:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711015616; x=1711620416; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hVKhUMPA/lZLPyzQ0H0k/UNNx6M+om6jLRUQuH/VY+g=; b=oF9fLxO+wmr+wCl0d3z5osoaDNze0drUty8gUfV4kEVzQkWKcixblmcQFXHsxa6Vr1 fp8jZoZaWlGjMNO8k6Kq/MMPfP23odDGUJ0d4357hzbamH5MivSFncOXFc61ZTkMP4/S mZahXo2U4DAm9O87oNETPbclYHcN8hFIx5q50Qk9IZs0bEFa674xoXSUJ2jB7rTjSxRU NDjzME35x9bgLabcAfnD8msWuEycmVVH6J3qWsW4EoTaLcU0vjPx7Ju8xpdEMtx5DJoL 4ePqNFYjEQItC5ueSjxH4HAwSJoDUdrq90C7/lmYZ4CKTSCYtrTaFVRbdQLAmP9G+Y1n 9CWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711015616; x=1711620416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hVKhUMPA/lZLPyzQ0H0k/UNNx6M+om6jLRUQuH/VY+g=; b=wSTpBeMJ1R6yChY8cBB4VzVQJITL+TSFYsE7lpUWmzHL+b6D6x20t2FswOj1EpGuEq FGUTakSGwAnjQY2UmKTPQL7Ylj3pv2SQhEWBJZmue0/g10aplJRu7H4xr5PZMM3faeyE oF7BUUhRA58N6aoDfsdK4fAlDoBSnTCFs7mSs9JfpJGmJ8xbhIVeGe2uTYKNhDOX1Vqm FqLo+vkIKJiuFzwGt+RJBMJ1zI25v1Tvf5vPeU7qfrTQa+wxqgAuTYCf7Ax5xPfpszpa QWxLkiUUU+tSa19V7F9SDTcnGql2YEjwc0PB1+sX9EmNjoOTA/8RWHxLKeYHEejeDzvV XB+w== X-Forwarded-Encrypted: i=1; AJvYcCXO7y+G0qKDS0RPtSh0+3wh8FEUMTstkIVnp4fBTc7pGf2TLaZuq4ZrHHPlRanY4HlY8IRiiA0JoOXChBgygRManrVoOek= X-Gm-Message-State: AOJu0YzthxIuXTIrtyZ7xmNqz4c1hB2MFrUqZ3awXvaOgEYxdLyYsQoD 0KXfWI1GJo60VVsLco0UY9g75QLEyvqp7gaLaM4OAS3XDojMizf7g/hcZu4AhOk= X-Google-Smtp-Source: AGHT+IEGs4xSfHIU0zUN114wSHRiIPPZEQkQmG0AGnQ80dmtNX8lCUcBc8U/XLzv3uWkQbAVAohRLg== X-Received: by 2002:a05:600c:1d96:b0:414:37f:18dc with SMTP id p22-20020a05600c1d9600b00414037f18dcmr2006908wms.1.1711015615622; Thu, 21 Mar 2024 03:06:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Dongwon Kim , qemu-devel@nongnu.org Cc: Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Vivek Kasireddy , "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/3] ui/console: Introduce dpy_gl_dmabuf_get_fd() helper Date: Thu, 21 Mar 2024 11:06:34 +0100 Message-ID: <20240321100635.64950-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240321100635.64950-1-philmd@linaro.org> References: <20240321100635.64950-1-philmd@linaro.org> 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=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 @linaro.org) X-ZM-MESSAGEID: 1711015656645100001 From: Dongwon Kim Signed-off-by: Dongwon Kim Message-Id: <20240320034229.3347130-1-dongwon.kim@intel.com> [PMD: Split patch in 3, part 2/3] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/ui/console.h | 1 + hw/vfio/display.c | 8 +++++++- ui/console.c | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/ui/console.h b/include/ui/console.h index a7f6cef26d..1f3d025548 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -360,6 +360,7 @@ void dpy_gl_cursor_position(QemuConsole *con, uint32_t pos_x, uint32_t pos_y); 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/hw/vfio/display.c b/hw/vfio/display.c index c962e5f88f..676b2fc5f3 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -259,9 +259,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); + fd =3D dpy_gl_dmabuf_get_fd(&dmabuf->buf); + if (fd > -1) { + close(fd); + } + dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); - close(dmabuf->buf.fd); g_free(dmabuf); } =20 diff --git a/ui/console.c b/ui/console.c index edabad64c0..10abeb9780 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1208,6 +1208,15 @@ uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf) return 0; } =20 +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) { --=20 2.41.0 From nobody Wed May 15 17:12:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711015700; cv=none; d=zohomail.com; s=zohoarc; b=LoAZ6lr3DTakCjNK+beyNw+cTNRZ5RoSonI/OtQ6NPVqgMJ2TcjR0j2B1H+u8n3g5GO056G/tL72Htz16o1HxWPBET5TXUGpCN4MZOSjl4dzPiNM5qW65qOxOqn2OG3O1MjCpW4itlBHIjFSnm8PEdGLaEzS/CO4TYDyardJ91o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711015700; 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=Ci2YLuSom554B/WFZVtS1fvhUUyUk3BWXa9IhWJxeEg=; b=N5C+Lg3QPyQWkNFTorsvI61quFUqbPgtAo/qlu3Wr5G8Duo7ZxSnjliaI4Afe4L/a9WruL0tTE6br7da9i2bSXRyhVNxC2squnTS+sUgHzTXH94KPEN5LfMVy7vRQTGLsDpDqw+gNlLzR7thc4iCdMRndilNc4dSciqOdzs9uik= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1711015700550755.5796882029108; Thu, 21 Mar 2024 03:08:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnFKd-0004Cb-HS; Thu, 21 Mar 2024 06:07:31 -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 1rnFKJ-0003nQ-Cc for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:07:18 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnFKE-0007zw-JF for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:07:11 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-513d717269fso1032225e87.0 for ; Thu, 21 Mar 2024 03:07:06 -0700 (PDT) Received: from localhost.localdomain (10.red-88-29-188.dynamicip.rima-tde.net. [88.29.188.10]) by smtp.gmail.com with ESMTPSA id p42-20020a05600c1daa00b004146f93a9d1sm2984002wms.25.2024.03.21.03.07.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 21 Mar 2024 03:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711015625; x=1711620425; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ci2YLuSom554B/WFZVtS1fvhUUyUk3BWXa9IhWJxeEg=; b=VMu+61GK/kHjBEC9DokCjFS0RfnQan8toqa3QgkffWdhkvmBdS98+JBVVoLbWJMDOg yHNNjS15T2bicy7Tcg1wpL6YiPVbe7auRd28ZqK4W4mnu7JMQNsxufPW/aNcRcvPDwPF iOBHHs2QOqGiVMjHBpuH/0N0qXmWVExFxOy9z8qjswRCgVK+isZi+gxCYFs8PMrXJr4w gbj2ASGF8u9C7Kv0cGhcCCZRsFN8EgsrnXLZCTpV12RYnUqJWGgSLXjaRBFZYN2Z6nTV 1kCb10CqtS0Ea3DfA4U7d68GbYvFDqndqxSJ/AHr3fPxk9CDPIuvV2Fy4YD9V0x7LZzD haFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711015625; x=1711620425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ci2YLuSom554B/WFZVtS1fvhUUyUk3BWXa9IhWJxeEg=; b=qmJcRVuAQhmIo8+Jy6YUur4sqwvochMJQt5MHPi7hAf5Xre7jn1RUoVvbiDj/5B+47 I6KSE3OuiCO7x1NDB4E5y/OmHY3yv3rbl0/DZDzydNqZb4fHr2VNfYQVso3sU5Yn83Nr llBk3YZaRLDlvzsHZnXA6Ovgdc18jNO/ga2O5oyF8dTwu8pl1YBfamYo40FGKIbhdccD CA1QfMNiWGMmUcrZ53uaSO/bhAa1E3UnMujyD5g+tdo9OZFrsswT4ULP5cwQyijPYhTG s4APhZKIuzucnnourDfTP6VDsonadh/w/NFPE2yBocimc2FOh1sK5ELRc0/YKOy5+Gj9 Q8uA== X-Forwarded-Encrypted: i=1; AJvYcCV1Xr1bYCDKHeD15VnMiXPPcJdlH3ajmOCl2vcipOserN0GnErraarm9WTtxpnjzstGBfCc1Z3HQjCMPnWvFeNQFvDpEn8= X-Gm-Message-State: AOJu0YxxutV5kqfJ06o4UmQp5vSqOT+Ak5lFMA7tIPLOubyn0EsOijoE ExDZ9UIh4wuySq1KH6mnzZtW5uSZwLoLii5n5MiKpHToQx6G3uiRAA5rF9tI1MB2HRvOo1x085N mUrU= X-Google-Smtp-Source: AGHT+IHn3m6uyg6+bPj72cqe0G587CviyfiaXH5xNeLEJ5wGgp+MAFFhUgOAlKJuVv/xSoX258UsQA== X-Received: by 2002:a05:6512:54e:b0:513:c963:895e with SMTP id h14-20020a056512054e00b00513c963895emr3315656lfl.42.1711015622945; Thu, 21 Mar 2024 03:07:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Dongwon Kim , qemu-devel@nongnu.org Cc: Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Vivek Kasireddy , "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [INCOMPLETE PATCH v3 3/3] ui/console: Introduce dpy_gl_create_dmabuf() helper Date: Thu, 21 Mar 2024 11:06:35 +0100 Message-ID: <20240321100635.64950-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240321100635.64950-1-philmd@linaro.org> References: <20240321100635.64950-1-philmd@linaro.org> 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=2a00:1450:4864:20::136; envelope-from=philmd@linaro.org; helo=mail-lf1-x136.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 @linaro.org) X-ZM-MESSAGEID: 1711015700787100005 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. Signed-off-by: Dongwon Kim Message-Id: <20240320034229.3347130-1-dongwon.kim@intel.com> [PMD: Split patch in 3, part 3/3] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Incomplete... VhostUserGPU doesn't allocate, vhost_user_gpu_handle_display() crashes. --- include/hw/vfio/vfio-common.h | 2 +- include/hw/virtio/virtio-gpu.h | 2 +- include/ui/console.h | 7 +++++++ hw/display/virtio-gpu-udmabuf.c | 23 ++++++++--------------- hw/vfio/display.c | 24 ++++++++++-------------- ui/console.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 55 insertions(+), 31 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..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 1f3d025548..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,12 @@ 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); diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index d680e871c1..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 @@ -213,8 +206,8 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, return -EINVAL; } =20 - width =3D dpy_gl_dmabuf_get_width(&new_primary->buf); - height =3D dpy_gl_dmabuf_get_height(&new_primary->buf); + width =3D dpy_gl_dmabuf_get_width(new_primary->buf); + height =3D dpy_gl_dmabuf_get_height(new_primary->buf); =20 if (g->dmabuf.primary[scanout_id]) { old_primary =3D g->dmabuf.primary[scanout_id]; @@ -222,7 +215,7 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, =20 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 676b2fc5f3..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); } @@ -262,12 +258,12 @@ static void vfio_display_free_one_dmabuf(VFIODisplay = *dpy, VFIODMABuf *dmabuf) int fd; =20 QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); - fd =3D dpy_gl_dmabuf_get_fd(&dmabuf->buf); + fd =3D dpy_gl_dmabuf_get_fd(dmabuf->buf); if (fd > -1) { close(fd); } =20 - dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); + dpy_gl_release_dmabuf(dpy->con, dmabuf->buf); g_free(dmabuf); } =20 @@ -303,13 +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); + width =3D dpy_gl_dmabuf_get_width(primary->buf); + height =3D dpy_gl_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 @@ -323,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 10abeb9780..616d636912 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1190,6 +1190,33 @@ 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) { @@ -1230,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.41.0