From nobody Thu Apr  3 10:34:18 2025
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=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1742981786; cv=none;
	d=zohomail.com; s=zohoarc;
	b=d08bmNNCsZbnWEvR3Euh55LTMZMhYabM0A5mCeCk1DLH7tLC4c5KrH4WHcuLFiMFbHwbVw6nqPNfUxF4LESYyrd4M/Ftg7wmexD6PpSCHW1Vdh1346xklx9X/velVyM/6BE5lNgDQSGb6MV+fPxUeMIW/Cs59ZnY7GASOJeq5Vo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1742981786;
 h=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=zXugeWpc+Q4q1zkES6fx7VpgJwCLDDyqvNSu0wIXzFo=;
	b=GXmZEyuetnRAc8hw8R+zm7UcpoKY3/5tYjylSx8utlT8VMV2mFUux53PSX7kCcVbxsY6raAnh1OMJVWZvSheF/2wgOEzqGeyN3cCmh3z5r+vCDQ3nDX8m4QoPxbBIzIvuPgKlOUFRxQYx7Jywu7eQmqFt42LwwSUpKFupRAvh+U=
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=<yuq825@gmail.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1742981786943565.6061188650726;
 Wed, 26 Mar 2025 02:36:26 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces@nongnu.org>)
	id 1txNA0-000103-3s; Wed, 26 Mar 2025 05:34:56 -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 <yuq825@gmail.com>) id 1txN9u-0000zF-0T
 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:54 -0400
Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <yuq825@gmail.com>) id 1txN9r-0003XL-Tp
 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:49 -0400
Received: by mail-pl1-x62a.google.com with SMTP id
 d9443c01a7336-224171d6826so64725175ad.3
 for <qemu-devel@nongnu.org>; Wed, 26 Mar 2025 02:34:47 -0700 (PDT)
Received: from localhost.localdomain (awork062150.netvigator.com.
 [203.198.28.150]) by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-73905fd57f7sm11729684b3a.44.2025.03.26.02.34.44
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 26 Mar 2025 02:34:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1742981686; x=1743586486; 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=zXugeWpc+Q4q1zkES6fx7VpgJwCLDDyqvNSu0wIXzFo=;
 b=kUwa1BRSUrHhAtHIkRcM1Gs39Lo+GETIkUb0WDpUIJFpyAceRHWjHflezlB/q2kicp
 BxKNLRKbfNniyYpiI3x2PchxkqbjTbkQ5tYJbMQH601uM4EC+QuMpLLi6ghxoJJHKxzV
 /Wz3akJMyIIdgkV6VN+pFKVQaV0KHWjaG1wU/oKYDYswGORqb/dRCYqRbNfSkFDiKb4E
 YXCwlK1hilm3UQRK2gS3sKAXVrrvWuwryQc6ks3wuK9YF0/rcYLld03veQ8Bxn6iMnBz
 KHglh0ds0gpe3XAWFzlzkC9JiTRIFM9tmZvLjYl18y4ZEfttFKuFkBI92iNhkasn00PE
 9T4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1742981686; x=1743586486;
 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=zXugeWpc+Q4q1zkES6fx7VpgJwCLDDyqvNSu0wIXzFo=;
 b=vyg7Hxdyxbvspu9C5ZNoITz8Swx2UkYdjchHUHIUE93//nVy0VAhVJb4BCr8RaD3Hz
 PpMS5wO3azUzF3gj05HKYuVaijf1KqItRyJj7/y/dI4kffc6T310Gluw5nJoXd0O7yHb
 Wrcc9jQ91RvSdhAyuQMiHa+TTQbzKsgKUQ6bZDzQX7+pGUc9HE2G7pLfwdjRWH4aobsZ
 ZNO2CfyXM+Fg//vcXIRhvPrMr0nayktbNTsedgQhY6+OVGw8c8jSfyQzAyyEPfkNITPn
 ++rU5UN/6U8j0tWCAV2ham3W+g+tkLl7nW13MhLdskiOKjqzDu4mzIKu2Z36Hpo/yvy4
 MPBQ==
X-Gm-Message-State: AOJu0YxXu6ocb1xjAWNrAdnga6EgoBu2VOEjepYlGc4zfBv/p+fcEOt7
 nmfmlCaa3SHmHWDKc2+Cm5MLW1QfEhAfGpq5JKZjVVyBNuaFVpxeoVEBS5s6
X-Gm-Gg: ASbGncsgN98ahl8AJ4YDNbvbFUooLmyttYM5u17rYQ5H0gkfJDzI2qIiou2Zd2oYlL5
 c49NbpcA7iwc4cF6T4Zjm6WASISFDvuKZPpDOX5XCJIFcIFl6SdoGyl0uy4VNyiWCzJcdjcWtoM
 AuGfWZmrRnZEaqaud5rl3FV9Qh9eHP279H6Zbr4DYFSce1XopPDL6ynCD36c80/gQD59zEj10EL
 /x+zmUBPS1Y955x0HzCA5L6LnwpZgNBOJqA0Tqmb28YOzo0Us9rv5Rle2F/JWVIycV+WpsUZHAB
 mdD0C7T4LYTkIzP29JfoyMajU6lapGAFIFhkd+UfBfXfW6uIiSpkmyDD00jnVdutZQY3eVldZf8
 UWwP9/a9kxgO7DGHptZj8
X-Google-Smtp-Source: 
 AGHT+IEG2RwX8EXpbq0HPAroIcGiT/iQF9F3ZQAXoE2eR2TmdslMsqNkWZouVCCmONmVcXFznQUywg==
X-Received: by 2002:a05:6a00:1409:b0:737:e73:f64b with SMTP id
 d2e1a72fcca58-7390593b7ffmr29348091b3a.1.1742981686106;
 Wed, 26 Mar 2025 02:34:46 -0700 (PDT)
From: yuq825@gmail.com
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>,
 Qiang Yu <yuq825@gmail.com>
Subject: [PATCH v2 5/6] ui/dbus: change dbus ScanoutDMABUF interface
Date: Wed, 26 Mar 2025 17:34:17 +0800
Message-ID: <20250326093418.397269-6-yuq825@gmail.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20250326093418.397269-1-yuq825@gmail.com>
References: <20250326093418.397269-1-yuq825@gmail.com>
MIME-Version: 1.0
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=2607:f8b0:4864:20::62a;
 envelope-from=yuq825@gmail.com; helo=mail-pl1-x62a.google.com
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 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,
 FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=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 @gmail.com)
X-ZM-MESSAGEID: 1742981789216019000
Content-Type: text/plain; charset="utf-8"

From: Qiang Yu <yuq825@gmail.com>

To handle multi plane.

v2:
  * use new dmabuf API and check length

Signed-off-by: Qiang Yu <yuq825@gmail.com>
---
 ui/dbus-display1.xml |  37 +++++++++++++++
 ui/dbus-listener.c   | 108 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 138 insertions(+), 7 deletions(-)

diff --git a/ui/dbus-display1.xml b/ui/dbus-display1.xml
index 72deefa455..c1d1a402b7 100644
--- a/ui/dbus-display1.xml
+++ b/ui/dbus-display1.xml
@@ -614,6 +614,43 @@
     </method>
   </interface>
=20
+  <!--
+      org.qemu.Display1.Listener.Unix.MultiPlane:
+
+      This optional client-side interface can complement
+      org.qemu.Display1.Listener on ``/org/qemu/Display1/Listener`` for
+      Unix-specific multi plane DMABUF scanout setup.
+  -->
+  <?if $(env.HOST_OS) !=3D windows?>
+  <interface name=3D"org.qemu.Display1.Listener.Unix.MultiPlane">
+    <!--
+        ScanoutDMABUF2:
+        @dmabuf: DMABUF file descriptor of each plane.
+        @width: display width, in pixels.
+        @height: display height, in pixels.
+        @offset: offset of each plane, in bytes.
+        @stride: stride of each plane, in bytes.
+        @num_planes: plane number.
+        @fourcc: DMABUF fourcc.
+        @modifier: DMABUF modifier.
+        @y0_top: whether Y position 0 is the top or not.
+
+        Resize and update the display content with DMABUF.
+    -->
+    <method name=3D"ScanoutDMABUF2">
+      <arg type=3D"ah" name=3D"dmabuf" direction=3D"in"/>
+      <arg type=3D"u" name=3D"width" direction=3D"in"/>
+      <arg type=3D"u" name=3D"height" direction=3D"in"/>
+      <arg type=3D"au" name=3D"offset" direction=3D"in"/>
+      <arg type=3D"au" name=3D"stride" direction=3D"in"/>
+      <arg type=3D"u" name=3D"num_planes" direction=3D"in"/>
+      <arg type=3D"u" name=3D"fourcc" direction=3D"in"/>
+      <arg type=3D"t" name=3D"modifier" direction=3D"in"/>
+      <arg type=3D"b" name=3D"y0_top" direction=3D"in"/>
+    </method>
+  </interface>
+  <?endif?>
+
   <!--
       org.qemu.Display1.Clipboard:
=20
diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 90147972cd..a225890084 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -85,6 +85,7 @@ struct _DBusDisplayListener {
 #endif
 #else /* !WIN32 */
     QemuDBusDisplay1ListenerUnixMap *map_proxy;
+    QemuDBusDisplay1ListenerUnixMultiPlane *multi_plane_proxy;
 #endif
=20
     guint dbus_filter;
@@ -288,10 +289,9 @@ static void dbus_call_update_gl(DisplayChangeListener =
*dcl,
 }
=20
 #ifdef CONFIG_GBM
-static void dbus_scanout_dmabuf(DisplayChangeListener *dcl,
-                                QemuDmaBuf *dmabuf)
+static void dbus_scanout_dmabuf_single_plane(DBusDisplayListener *ddl,
+                                             QemuDmaBuf *dmabuf)
 {
-    DBusDisplayListener *ddl =3D container_of(dcl, DBusDisplayListener, dc=
l);
     g_autoptr(GError) err =3D NULL;
     g_autoptr(GUnixFDList) fd_list =3D NULL;
     int fd;
@@ -322,6 +322,81 @@ static void dbus_scanout_dmabuf(DisplayChangeListener =
*dcl,
         y0_top, G_DBUS_CALL_FLAGS_NONE,
         -1, fd_list, NULL, NULL, NULL);
 }
+
+static void dbus_scanout_dmabuf_multi_plane(DBusDisplayListener *ddl,
+                                            QemuDmaBuf *dmabuf)
+{
+    g_autoptr(GError) err =3D NULL;
+    g_autoptr(GUnixFDList) fd_list =3D NULL;
+    int i, fd_index[DMABUF_MAX_PLANES], num_fds;
+    uint32_t width, height, fourcc;
+    GVariant *fd, *offset, *stride, *fd_handles[DMABUF_MAX_PLANES];
+    uint64_t modifier;
+    bool y0_top;
+    int nfds, noffsets, nstrides;
+    const int *fds =3D qemu_dmabuf_get_fds(dmabuf, &nfds);
+    const uint32_t *offsets =3D qemu_dmabuf_get_offsets(dmabuf, &noffsets);
+    const uint32_t *strides =3D qemu_dmabuf_get_strides(dmabuf, &nstrides);
+    uint32_t num_planes =3D qemu_dmabuf_get_num_planes(dmabuf);
+
+    assert(nfds >=3D num_planes);
+    assert(noffsets >=3D num_planes);
+    assert(nstrides >=3D num_planes);
+
+    fd_list =3D g_unix_fd_list_new();
+
+    for (num_fds =3D 0; num_fds < num_planes; num_fds++) {
+        int plane_fd =3D fds[num_fds];
+
+        if (plane_fd < 0)
+            break;
+
+        fd_index[num_fds] =3D g_unix_fd_list_append(fd_list, plane_fd, &er=
r);
+        if (fd_index[num_fds] < 0) {
+            error_report("Failed to setup dmabuf fdlist: %s", err->message=
);
+            return;
+        }
+    }
+
+    ddl_discard_display_messages(ddl);
+
+    width =3D qemu_dmabuf_get_width(dmabuf);
+    height =3D qemu_dmabuf_get_height(dmabuf);
+    fourcc =3D qemu_dmabuf_get_fourcc(dmabuf);
+    modifier =3D qemu_dmabuf_get_modifier(dmabuf);
+    y0_top =3D qemu_dmabuf_get_y0_top(dmabuf);
+
+    offset =3D g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       offsets, num_planes, sizeof(uint32_=
t));
+    stride =3D g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       strides, num_planes, sizeof(uint32_=
t));
+
+    for (i =3D 0; i < num_fds; i++) {
+        fd_handles[i] =3D g_variant_new_handle(fd_index[i]);
+    }
+    fd =3D g_variant_new_array(G_VARIANT_TYPE_HANDLE, fd_handles, num_fds);
+
+    qemu_dbus_display1_listener_unix_multi_plane_call_scanout_dmabuf2(
+        ddl->multi_plane_proxy, fd, width, height, offset, stride, num_pla=
nes,
+        fourcc, modifier, y0_top, G_DBUS_CALL_FLAGS_NONE,
+        -1, fd_list, NULL, NULL, NULL);
+}
+
+static void dbus_scanout_dmabuf(DisplayChangeListener *dcl,
+                                QemuDmaBuf *dmabuf)
+{
+    DBusDisplayListener *ddl =3D container_of(dcl, DBusDisplayListener, dc=
l);
+
+    if (ddl->multi_plane_proxy) {
+        dbus_scanout_dmabuf_multi_plane(ddl, dmabuf);
+    } else {
+        if (qemu_dmabuf_get_num_planes(dmabuf) > 1) {
+            g_debug("org.qemu.Display1.Listener.ScanoutDMABUF does not sup=
port mutli plane");
+            return;
+        }
+        dbus_scanout_dmabuf_single_plane(ddl, dmabuf);
+    }
+}
 #endif /* GBM */
 #endif /* OPENGL */
=20
@@ -514,10 +589,6 @@ static void dbus_scanout_texture(DisplayChangeListener=
 *dcl,
         error_report("%s: failed to export dmabuf for texture", __func__);
         return;
     }
-    if (num_planes > 1) {
-        error_report("%s: does not support multi-plane dmabuf", __func__);
-        return;
-    }
     dmabuf =3D qemu_dmabuf_new(w, h, offset, stride, x, y, backing_width,
                              backing_height, fourcc, modifier, fd, num_pla=
nes,
                              false, backing_y_0_top);
@@ -886,6 +957,8 @@ dbus_display_listener_dispose(GObject *object)
 #ifdef CONFIG_OPENGL
     egl_fb_destroy(&ddl->fb);
 #endif
+#else /* !WIN32 */
+    g_clear_object(&ddl->multi_plane_proxy);
 #endif
=20
     G_OBJECT_CLASS(dbus_display_listener_parent_class)->dispose(object);
@@ -1074,6 +1147,26 @@ dbus_display_listener_setup_shared_map(DBusDisplayLi=
stener *ddl)
 #endif
 }
=20
+static void dbus_display_listener_setup_multi_plane(DBusDisplayListener *d=
dl)
+{
+#ifndef WIN32
+    g_autoptr(GError) err =3D NULL;
+
+    if (!dbus_display_listener_implements(
+            ddl, "org.qemu.Display1.Listener.Unix.MultiPlane")) {
+        return;
+    }
+    ddl->multi_plane_proxy =3D
+        qemu_dbus_display1_listener_unix_multi_plane_proxy_new_sync(
+            ddl->conn, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, NULL,
+            "/org/qemu/Display1/Listener", NULL, &err);
+    if (!ddl->multi_plane_proxy) {
+        g_debug("Failed to setup Unix multi plane proxy: %s", err->message=
);
+        return;
+    }
+#endif
+}
+
 static GDBusMessage *
 dbus_filter(GDBusConnection *connection,
             GDBusMessage    *message,
@@ -1162,6 +1255,7 @@ dbus_display_listener_new(const char *bus_name,
     dbus_display_listener_setup_shared_map(ddl);
     trace_dbus_can_share_map(ddl->can_share_map);
     dbus_display_listener_setup_d3d11(ddl);
+    dbus_display_listener_setup_multi_plane(ddl);
=20
     con =3D qemu_console_lookup_by_index(dbus_display_console_get_index(co=
nsole));
     assert(con);
--=20
2.43.0