From nobody Wed Apr 2 13:14:35 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=1742981757; cv=none; d=zohomail.com; s=zohoarc; b=Pop3GdUdIxfCwNq5g1cUfaWWpSFe7g0MG9kBnLvvIqwD3qIDrl8tsLI3a+SplKRoyPhev9PaiBVAIqFHNARNMRWx2NwVz0XRui+JW9moGbhzpb6ueYeNJ+Cs7Andw1Ca6kn6v7fZ36gsm54gW20eQ5aLNdbIty8d8BUgPVKAFc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742981757; 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=ATYBbnhbtbBsTk/t++AIt/R5/IqVj7f3CIXIbyHaWGw=; b=mg7t6iX3puRU3GTz03c6jhQumr+aycCqifDG28E9ZgOkgbm0w7VOGDDOdxu4DB6ycpZeb8tfoS0qEZNI0y5hkdNcnKGgPP3Ux5vTRduwAs+FGn68y9ZO4Xar3HHZqa/X+7o+kK65nJbmE1mF0IFY0Fhd0xyQ9kG2MpNn4ffQTmw= 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 1742981757668870.9627644729106; Wed, 26 Mar 2025 02:35:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txN9p-0000xe-Kk; Wed, 26 Mar 2025 05:34:45 -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 1txN9m-0000wx-1c for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:43 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txN9j-0003WX-Ko for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:41 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22435603572so121738685ad.1 for ; Wed, 26 Mar 2025 02:34:39 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 02:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742981677; x=1743586477; 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=ATYBbnhbtbBsTk/t++AIt/R5/IqVj7f3CIXIbyHaWGw=; b=Ohkrh9UKUGJUb0vqBQu+o6CZX/DgGkcOeEf7hc6nLnktyAr/WdiDNNSlTyqhX/Ez48 +di1snCJdVPik915KsZ5wnkc1m3Gu2TR4x7rKYhPGeXN7qCodCmWepNVMdSM8ggeLvDm dkWc/2eEPRVIb58FfC+lGIoYAZDlvUt3jiQYtFtd/oXUifiLA/c+W0Hm2X/31L0dn4Lg GtYSeL0nCzMLLVO9NXgoiduaiFgpnINnC/xuTiGMCiVhoHqLgRBx6/9hjvQOAQiqh9zd uyORTla7G2mvPJGggKq2ak2lMqQIMbSTAQfrgUCKll9oMn/YxBJcnuLaHNN6J5wsV6w7 a/Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742981677; x=1743586477; 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=ATYBbnhbtbBsTk/t++AIt/R5/IqVj7f3CIXIbyHaWGw=; b=u6nsM8fQNy939JiRBh0vCPhZi/F6KVkRX5WtqEfwvHQgspAcP9Zsk/6uPwltUV/5/I mjCqNgqywEHl7oTMeBeI9Dt+UOkc7ZY9JbnoVXR9B49epbUVLsbR7xyhe+iNfzU2Aa7K LETQOx68v3zNS1dReEPNxZxa6TXi9Xt34m9SHB5IqBE6fEVq2VTutc+VOm4LHkx/WvGI 9wm2GF7l/0QTcg03HiWig8JZqC1jDBwnJg2OrNvAi6MZcjrIkJRM5OVvwrsOjSDk01kc WhOrmJcLXVRDrdowKL0jo8xpVWaXjNyz+JWcyDtHz8B2EMQPJe1TQDX/YeH4xt0l6C97 F4lQ== X-Gm-Message-State: AOJu0YwmPmxrSFoSph9Ob6qAvCr1nbn/rvm6l8rGqsMUADR/YNm6CBhF DxE76wqUokqVgB6dL4UGb+iM6uQwF3Yds/PFIb+GmE3UALAFi2Y2u6gsKDdJ X-Gm-Gg: ASbGnctN5IV8NBrTR2HgI52fiEYAGPKpAu+EnOddwB3MmRxHEObuM/UZDst8DPA3lAb gR2RuZ/aZH1ueFpn+3tMyyjNJL9aZrVT+JDbVnAnkIgTXMI80GHy5A5QQilo113k7A/A5Dp045g lSdIWRdTeILrTdUwfDFi5uEDyuN5rm8fdPrbR6t0kMjJyaSJd50gBmM/0qvWSnVCkCS66XYuN+v Z2PNsrUTa4kM7aY/y4tt7GOv0YK5P9ByIivRDc91MPd2VZabuWQaD7RfXD1zE2ZgfIeKP5kt7nn RCWtp1vHBr+0kUQgknjU1isZEaFNYLjXm8h8Wyld5XPSy7Ubu0ueG3bCAVAw0wNPqdjkW8gYguv 3kzrqvASEIyZLtbreZiqO X-Google-Smtp-Source: AGHT+IHZ2vqUv23U8AsBa4YSG68aVRfnjxi0mTUrPvO/27P3M+g8ELXa5MWQq0U/2SY2VkAfQbQPWA== X-Received: by 2002:a05:6a21:2d87:b0:1f5:93b1:6a58 with SMTP id adf61e73a8af0-1fe42f090dcmr34133074637.8.1742981677192; Wed, 26 Mar 2025 02:34:37 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu Subject: [PATCH v2 1/6] ui/dmabuf: extend QemuDmaBuf to support multi-plane Date: Wed, 26 Mar 2025 17:34:13 +0800 Message-ID: <20250326093418.397269-2-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::636; envelope-from=yuq825@gmail.com; helo=mail-pl1-x636.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: 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 @gmail.com) X-ZM-MESSAGEID: 1742981759455019100 Content-Type: text/plain; charset="utf-8" From: Qiang Yu mesa/radeonsi is going to support explicit modifier which may export a multi-plane texture. For example, texture with DCC enabled (a compressed format) has two planes, one with compressed data, the other with meta data for compression. v2: * change API qemu_dmabuf_get_fd/offset/stride to qemu_dmabuf_get_fds/offsets/strides. * change API qemu_dmabuf_dup_fd to qemu_dmabuf_dup_fds. * add an extra arg to these API for the length of the array. Signed-off-by: Qiang Yu Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/display/vhost-user-gpu.c | 6 ++- hw/display/virtio-gpu-udmabuf.c | 6 ++- hw/vfio/display.c | 7 +-- include/ui/dmabuf.h | 20 +++++---- ui/dbus-listener.c | 10 ++--- ui/dmabuf.c | 77 +++++++++++++++++++++++---------- ui/egl-helpers.c | 4 +- ui/spice-display.c | 4 +- 8 files changed, 86 insertions(+), 48 deletions(-) diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 2aed6243f6..a7949c7078 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -249,6 +249,8 @@ 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); + uint32_t offset =3D 0; + uint32_t stride =3D m->fd_stride; uint64_t modifier =3D 0; QemuDmaBuf *dmabuf; =20 @@ -282,10 +284,10 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostU= serGpuMsg *msg) } =20 dmabuf =3D qemu_dmabuf_new(m->width, m->height, - m->fd_stride, 0, 0, + &offset, &stride, 0, 0, m->fd_width, m->fd_height, m->fd_drm_fourcc, modifier, - fd, false, m->fd_flags & + &fd, 1, false, m->fd_flags & VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP); =20 dpy_gl_scanout_dmabuf(con, dmabuf); diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index 85ca23cb32..34fbe05b7a 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -176,16 +176,18 @@ static VGPUDMABuf struct virtio_gpu_rect *r) { VGPUDMABuf *dmabuf; + uint32_t offset =3D 0; =20 if (res->dmabuf_fd < 0) { return NULL; } =20 dmabuf =3D g_new0(VGPUDMABuf, 1); - dmabuf->buf =3D qemu_dmabuf_new(r->width, r->height, fb->stride, + dmabuf->buf =3D qemu_dmabuf_new(r->width, r->height, + &offset, &fb->stride, r->x, r->y, fb->width, fb->height, qemu_pixman_to_drm_format(fb->format), - 0, res->dmabuf_fd, true, false); + 0, &res->dmabuf_fd, 1, true, false); dmabuf->scanout_id =3D scanout_id; QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next); =20 diff --git a/hw/vfio/display.c b/hw/vfio/display.c index ea87830fe0..9d882235fb 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -214,6 +214,7 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevic= e *vdev, struct vfio_device_gfx_plane_info plane; VFIODMABuf *dmabuf; int fd, ret; + uint32_t offset =3D 0; =20 memset(&plane, 0, sizeof(plane)); plane.argsz =3D sizeof(plane); @@ -246,10 +247,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 =3D qemu_dmabuf_new(plane.width, plane.height, - plane.stride, 0, 0, plane.width, + dmabuf->buf =3D qemu_dmabuf_new(plane.width, plane.height, &offset, + &plane.stride, 0, 0, plane.width, plane.height, plane.drm_format, - plane.drm_format_mod, fd, false, false); + plane.drm_format_mod, &fd, 1, false, fal= se); =20 if (plane_type =3D=3D DRM_PLANE_TYPE_CURSOR) { vfio_display_update_cursor(dmabuf, &plane); diff --git a/include/ui/dmabuf.h b/include/ui/dmabuf.h index dc74ba895a..3decdca497 100644 --- a/include/ui/dmabuf.h +++ b/include/ui/dmabuf.h @@ -10,24 +10,29 @@ #ifndef DMABUF_H #define DMABUF_H =20 +#define DMABUF_MAX_PLANES 4 + typedef struct QemuDmaBuf QemuDmaBuf; =20 QemuDmaBuf *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 fourcc, - uint64_t modifier, int dmabuf_fd, + const uint32_t *offset, const uint32_t *stride, + uint32_t x, uint32_t y, + uint32_t backing_width, uint32_t backing_heigh= t, + uint32_t fourcc, uint64_t modifier, + const int32_t *dmabuf_fd, uint32_t num_planes, bool allow_fences, bool y0_top); void qemu_dmabuf_free(QemuDmaBuf *dmabuf); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuDmaBuf, qemu_dmabuf_free); =20 -int qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf); -int qemu_dmabuf_dup_fd(QemuDmaBuf *dmabuf); +const int *qemu_dmabuf_get_fds(QemuDmaBuf *dmabuf, int *nfds); +void qemu_dmabuf_dup_fds(QemuDmaBuf *dmabuf, int *fds, int nfds); void qemu_dmabuf_close(QemuDmaBuf *dmabuf); uint32_t qemu_dmabuf_get_width(QemuDmaBuf *dmabuf); uint32_t qemu_dmabuf_get_height(QemuDmaBuf *dmabuf); -uint32_t qemu_dmabuf_get_stride(QemuDmaBuf *dmabuf); +const uint32_t *qemu_dmabuf_get_offsets(QemuDmaBuf *dmabuf, int *noffsets); +const uint32_t *qemu_dmabuf_get_strides(QemuDmaBuf *dmabuf, int *nstrides); +uint32_t qemu_dmabuf_get_num_planes(QemuDmaBuf *dmabuf); uint32_t qemu_dmabuf_get_fourcc(QemuDmaBuf *dmabuf); uint64_t qemu_dmabuf_get_modifier(QemuDmaBuf *dmabuf); uint32_t qemu_dmabuf_get_texture(QemuDmaBuf *dmabuf); @@ -44,6 +49,5 @@ void qemu_dmabuf_set_texture(QemuDmaBuf *dmabuf, uint32_t= texture); void qemu_dmabuf_set_fence_fd(QemuDmaBuf *dmabuf, int32_t fence_fd); void qemu_dmabuf_set_sync(QemuDmaBuf *dmabuf, void *sync); void qemu_dmabuf_set_draw_submitted(QemuDmaBuf *dmabuf, bool draw_submitte= d); -void qemu_dmabuf_set_fd(QemuDmaBuf *dmabuf, int32_t fd); =20 #endif diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 51244c9240..65373d519c 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -299,7 +299,7 @@ static void dbus_scanout_dmabuf(DisplayChangeListener *= dcl, uint64_t modifier; bool y0_top; =20 - fd =3D qemu_dmabuf_get_fd(dmabuf); + fd =3D qemu_dmabuf_get_fds(dmabuf, NULL)[0]; fd_list =3D g_unix_fd_list_new(); if (g_unix_fd_list_append(fd_list, fd, &err) !=3D 0) { error_report("Failed to setup dmabuf fdlist: %s", err->message); @@ -310,7 +310,7 @@ static void dbus_scanout_dmabuf(DisplayChangeListener *= dcl, =20 width =3D qemu_dmabuf_get_width(dmabuf); height =3D qemu_dmabuf_get_height(dmabuf); - stride =3D qemu_dmabuf_get_stride(dmabuf); + stride =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; fourcc =3D qemu_dmabuf_get_fourcc(dmabuf); modifier =3D qemu_dmabuf_get_modifier(dmabuf); y0_top =3D qemu_dmabuf_get_y0_top(dmabuf); @@ -505,7 +505,7 @@ static void dbus_scanout_texture(DisplayChangeListener = *dcl, #ifdef CONFIG_GBM g_autoptr(QemuDmaBuf) dmabuf =3D NULL; int fd; - uint32_t stride, fourcc; + uint32_t offset =3D 0, stride, fourcc; uint64_t modifier; =20 assert(tex_id); @@ -515,8 +515,8 @@ static void dbus_scanout_texture(DisplayChangeListener = *dcl, error_report("%s: failed to get fd for texture", __func__); return; } - dmabuf =3D qemu_dmabuf_new(w, h, stride, x, y, backing_width, - backing_height, fourcc, modifier, fd, + dmabuf =3D qemu_dmabuf_new(w, h, &offset, &stride, x, y, backing_width, + backing_height, fourcc, modifier, &fd, 1, false, backing_y_0_top); =20 dbus_scanout_dmabuf(dcl, dmabuf); diff --git a/ui/dmabuf.c b/ui/dmabuf.c index df7a09703f..99e085fe88 100644 --- a/ui/dmabuf.c +++ b/ui/dmabuf.c @@ -11,10 +11,12 @@ #include "ui/dmabuf.h" =20 struct QemuDmaBuf { - int fd; + int fd[DMABUF_MAX_PLANES]; uint32_t width; uint32_t height; - uint32_t stride; + uint32_t offset[DMABUF_MAX_PLANES]; + uint32_t stride[DMABUF_MAX_PLANES]; + uint32_t num_planes; uint32_t fourcc; uint64_t modifier; uint32_t texture; @@ -30,28 +32,33 @@ struct QemuDmaBuf { }; =20 QemuDmaBuf *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 fourcc, - uint64_t modifier, int32_t dmabuf_fd, + const uint32_t *offset, const uint32_t *stride, + uint32_t x, uint32_t y, + uint32_t backing_width, uint32_t backing_heigh= t, + uint32_t fourcc, uint64_t modifier, + const int32_t *dmabuf_fd, uint32_t num_planes, bool allow_fences, bool y0_top) { QemuDmaBuf *dmabuf; =20 + assert(num_planes > 0 && num_planes <=3D DMABUF_MAX_PLANES); + dmabuf =3D g_new0(QemuDmaBuf, 1); =20 dmabuf->width =3D width; dmabuf->height =3D height; - dmabuf->stride =3D stride; + memcpy(dmabuf->offset, offset, num_planes * sizeof(*offset)); + memcpy(dmabuf->stride, stride, num_planes * sizeof(*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; + memcpy(dmabuf->fd, dmabuf_fd, num_planes * sizeof(*dmabuf_fd)); dmabuf->allow_fences =3D allow_fences; dmabuf->y0_top =3D y0_top; dmabuf->fence_fd =3D -1; + dmabuf->num_planes =3D num_planes; =20 return dmabuf; } @@ -65,31 +72,39 @@ void qemu_dmabuf_free(QemuDmaBuf *dmabuf) g_free(dmabuf); } =20 -int qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf) +const int *qemu_dmabuf_get_fds(QemuDmaBuf *dmabuf, int *nfds) { assert(dmabuf !=3D NULL); =20 + if (nfds) + *nfds =3D ARRAY_SIZE(dmabuf->fd); + return dmabuf->fd; } =20 -int qemu_dmabuf_dup_fd(QemuDmaBuf *dmabuf) +void qemu_dmabuf_dup_fds(QemuDmaBuf *dmabuf, int *fds, int nfds) { + int i; + assert(dmabuf !=3D NULL); + assert(nfds >=3D dmabuf->num_planes); =20 - if (dmabuf->fd >=3D 0) { - return dup(dmabuf->fd); - } else { - return -1; + for (i =3D 0; i < dmabuf->num_planes; i++) { + fds[i] =3D dmabuf->fd[i] >=3D 0 ? dup(dmabuf->fd[i]) : -1; } } =20 void qemu_dmabuf_close(QemuDmaBuf *dmabuf) { + int i; + assert(dmabuf !=3D NULL); =20 - if (dmabuf->fd >=3D 0) { - close(dmabuf->fd); - dmabuf->fd =3D -1; + for (i =3D 0; i < dmabuf->num_planes; i++) { + if (dmabuf->fd[i] >=3D 0) { + close(dmabuf->fd[i]); + dmabuf->fd[i] =3D -1; + } } } =20 @@ -107,13 +122,33 @@ uint32_t qemu_dmabuf_get_height(QemuDmaBuf *dmabuf) return dmabuf->height; } =20 -uint32_t qemu_dmabuf_get_stride(QemuDmaBuf *dmabuf) +const uint32_t *qemu_dmabuf_get_offsets(QemuDmaBuf *dmabuf, int *noffsets) +{ + assert(dmabuf !=3D NULL); + + if (noffsets) + *noffsets =3D ARRAY_SIZE(dmabuf->offset); + + return dmabuf->offset; +} + +const uint32_t *qemu_dmabuf_get_strides(QemuDmaBuf *dmabuf, int *nstrides) { assert(dmabuf !=3D NULL); =20 + if (nstrides) + *nstrides =3D ARRAY_SIZE(dmabuf->stride); + return dmabuf->stride; } =20 +uint32_t qemu_dmabuf_get_num_planes(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->num_planes; +} + uint32_t qemu_dmabuf_get_fourcc(QemuDmaBuf *dmabuf) { assert(dmabuf !=3D NULL); @@ -221,9 +256,3 @@ void qemu_dmabuf_set_draw_submitted(QemuDmaBuf *dmabuf,= bool draw_submitted) assert(dmabuf !=3D NULL); dmabuf->draw_submitted =3D draw_submitted; } - -void qemu_dmabuf_set_fd(QemuDmaBuf *dmabuf, int32_t fd) -{ - assert(dmabuf !=3D NULL); - dmabuf->fd =3D fd; -} diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index d591159480..d194d004b7 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -323,9 +323,9 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) attrs[i++] =3D qemu_dmabuf_get_fourcc(dmabuf); =20 attrs[i++] =3D EGL_DMA_BUF_PLANE0_FD_EXT; - attrs[i++] =3D qemu_dmabuf_get_fd(dmabuf); + attrs[i++] =3D qemu_dmabuf_get_fds(dmabuf, NULL)[0]; attrs[i++] =3D EGL_DMA_BUF_PLANE0_PITCH_EXT; - attrs[i++] =3D qemu_dmabuf_get_stride(dmabuf); + attrs[i++] =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; attrs[i++] =3D EGL_DMA_BUF_PLANE0_OFFSET_EXT; attrs[i++] =3D 0; #ifdef EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT diff --git a/ui/spice-display.c b/ui/spice-display.c index c794ae0649..40547edb5e 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -1075,10 +1075,10 @@ static void qemu_spice_gl_update(DisplayChangeListe= ner *dcl, stride, fourcc, false); } } else { - stride =3D qemu_dmabuf_get_stride(dmabuf); + stride =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; fourcc =3D qemu_dmabuf_get_fourcc(dmabuf); y_0_top =3D qemu_dmabuf_get_y0_top(dmabuf); - fd =3D qemu_dmabuf_dup_fd(dmabuf); + qemu_dmabuf_dup_fds(dmabuf, &fd, 1); =20 trace_qemu_spice_gl_forward_dmabuf(ssd->qxl.id, width, height); /* note: spice server will close the fd, so hand over a dup */ --=20 2.43.0 From nobody Wed Apr 2 13:14:35 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=1742981790; cv=none; d=zohomail.com; s=zohoarc; b=R017S/dvQxMIeqaEOHFdeS+gzrgFxSaC3RZrchMo8Z5uCTXg3CUgn3gISCYI97Ui4kGQE/UqqehJrvbVpLsYN6dVp9hQ1SqeOl2L74g8YYvKU6bIVDqFmX6KyK5AxoJyypkaoxRMnJ12jqISPC/rfjpRr3OP5dzjzeW2aF7NXkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742981790; 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=TJXmFtW3xpZS/E0hzVsrasLFEbBGzKrORRb7gCBCf34=; b=n9hOSkbMi9xATthAYv/8fyQRvrUc1mDioDclyu5JxjdYGnLa9Xkyy7CA4Lxs5v9Gd14utVE5L4Ppg9ToUt6EzV8eOOaJy05f1U1707rb1AOR9mTIPSYuF5yIljXhKPnfQpHcbn7n+7nRwXtR/fckniYxVFOAnXofqPRrll5ncpA= 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 1742981790986280.4740655844755; Wed, 26 Mar 2025 02:36:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txN9o-0000xR-My; Wed, 26 Mar 2025 05:34:44 -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 1txN9n-0000wz-E4 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:43 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txN9l-0003Wi-Hp for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:43 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-225477548e1so127779085ad.0 for ; Wed, 26 Mar 2025 02:34:41 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 02:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742981679; x=1743586479; 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=TJXmFtW3xpZS/E0hzVsrasLFEbBGzKrORRb7gCBCf34=; b=Ginp3pmlljz5g1WM+uFLMfXjOIRTBbJJ2FfdHVJDUbaSKsuDhqetFhO3eZhn83CO8C q8UB1lq6l5xnpTYOV584/lWAIfX+UYDApdf3YWWoYUDFdKf8+tWB6CrYe5zqVfCaxvB0 FQgA8gWVX9dw9+JnyqYubYBi9bMp8Fy1w4icDBgu2nG9pOki4oRck/+n+AatMwgToCh2 YRNiwhhajUAnxvYc17cYpJkfeT5HpuGZMnVxuamO3R2bwX46mB6QNCip4dbJzsv+1PD4 yRfvsmr98srGTTbI0sjzPdM3wkjZXmYGUQPVvnrI43AeUq9Qcgkfou0QO2gqHuKwTFRA RS1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742981679; x=1743586479; 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=TJXmFtW3xpZS/E0hzVsrasLFEbBGzKrORRb7gCBCf34=; b=tw2uoXRPsHEKhZw1YlTyF6CxwcRvvBd3EXD/2kcFp9z43vdwb8DJoYS9b3QiHIcLpu z57S5djAPROSu0kvXEjMalrYpNFWcH987d+NILM4AEzb1BQUI+RUtjwppDb1m0CoMM+A nGD0YsFVp6dYnohLywqOB2BpYNhW8u+uCZmvA9U62fr5J7y91CB5cdkjix+kOkOKGfwP AMy/tKREntKYFJLFeA67sjq0YUhFYU2HLqcs2NxNJn/qd5UWv6GtVwchIIBldJMyQmtR 71oypxuCeNuEB2NTOQf+IfR3dHTdQAZBjJWoiExB9frCO9oxIvQ86SR3RC1ZM1eIEXEq PUUw== X-Gm-Message-State: AOJu0Yztet+fNZsl63gJT5Qz88ts7E1Mk6Pu49EfzMJ2QIz5CVpty5OB QLSYu9XeUBEcfeTlpFwaxiMta9Jc7E81764uOQLJyACg0p6EE1y7XhaUb175 X-Gm-Gg: ASbGncvBQj9SkiTMq8Zu6gwAWbbwJB/V4reD3wzt6UAlywhaEOKQCKNdA/ltMw9HeAO npMDG+8pCAq6lCtrVv3U8/K5HPfjHpil1p1L15UMppQBGH6Bo3VDGZ4NDJHpS0+vfzpCLzW+6DX HiJuIxka1t1qVKG7qwTJmH+RRrEcVtM76gYhwXq1bGlm48djDV/N5ahSfeyergDZSfqWAanv959 qtMITHyP6ygkIeg7zdFn8Z2sbf7yt/l8/VfrVMah9xvAflB4Rv3O/LfNUtojjOW9txM/p+hjyna pdlL6Y/Fsow+8f3A7zRpIi3JBUwf1LIXfDzrR9tT1w2HjQCjL3rH3sfMbEJupPg61w+w1AGDEfR HmEKIdMnhBk5SzGMAFyVW X-Google-Smtp-Source: AGHT+IE+UHmVvMjAbSulO5GFvXf0xugw8ZDMzZ8QEoZqtFet67V0YYIjv0lXviev2Sg1S+6SiFD2Tw== X-Received: by 2002:a05:6a00:ac8:b0:736:4ebd:e5a with SMTP id d2e1a72fcca58-73905a63bd5mr35314224b3a.20.1742981679403; Wed, 26 Mar 2025 02:34:39 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu Subject: [PATCH v2 2/6] ui/egl: require EGL_EXT_image_dma_buf_import_modifiers Date: Wed, 26 Mar 2025 17:34:14 +0800 Message-ID: <20250326093418.397269-3-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::632; envelope-from=yuq825@gmail.com; helo=mail-pl1-x632.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: 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 @gmail.com) X-ZM-MESSAGEID: 1742981793416019100 Content-Type: text/plain; charset="utf-8" From: Qiang Yu It's used already, just check it explicitly. Signed-off-by: Qiang Yu Reviewed-by: Marc-Andr=C3=A9 Lureau --- ui/egl-helpers.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index d194d004b7..432863d702 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -257,6 +257,11 @@ int egl_rendernode_init(const char *rendernode, Displa= yGLMode mode) error_report("egl: EGL_MESA_image_dma_buf_export not supported"); goto err; } + if (!epoxy_has_egl_extension(qemu_egl_display, + "EGL_EXT_image_dma_buf_import_modifiers")= ) { + error_report("egl: EGL_EXT_image_dma_buf_import_modifiers not supp= orted"); + goto err; + } =20 qemu_egl_rn_ctx =3D qemu_egl_init_ctx(); if (!qemu_egl_rn_ctx) { @@ -308,7 +313,7 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) EGLImageKHR image =3D EGL_NO_IMAGE_KHR; EGLint attrs[64]; int i =3D 0; - uint64_t modifier; + uint64_t modifier =3D qemu_dmabuf_get_modifier(dmabuf); uint32_t texture =3D qemu_dmabuf_get_texture(dmabuf); =20 if (texture !=3D 0) { @@ -328,15 +333,12 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) attrs[i++] =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; attrs[i++] =3D EGL_DMA_BUF_PLANE0_OFFSET_EXT; attrs[i++] =3D 0; -#ifdef EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT - modifier =3D qemu_dmabuf_get_modifier(dmabuf); if (modifier) { attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT; attrs[i++] =3D (modifier >> 0) & 0xffffffff; attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT; attrs[i++] =3D (modifier >> 32) & 0xffffffff; } -#endif attrs[i++] =3D EGL_NONE; =20 image =3D eglCreateImageKHR(qemu_egl_display, --=20 2.43.0 From nobody Wed Apr 2 13:14:35 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=1742981779; cv=none; d=zohomail.com; s=zohoarc; b=iq5KnvEfPUrVs7kdIfhbCFL94vGr+N9K28dCmxCQR89Z6HyW3RM0LVVWPPQHR7Ag47MHk89bqhI04jRcbOXJyaBMyVqbbXHZOaMtd8vMO8ljjfKhA5S2AIKC2be6RimnLyjMHp33DpGcnmfHSW6Cvzjc/wXSFr+EIpbLeHeh1Zc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742981779; 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=th8ONn47n1N39VwqSrZXDPi4AfiPl05PuU27NT3wHrA=; b=DEWuKpJZK1y/sbtx9kz54QLqJDbwmSBUigdIb/TNMfAULyPuqcj/PvNLttT/r5ZE7snrkCY9ecBiJUax05TKS1FtxOU4wAy3OP3WI4+1Ro9x+OicXUQIlv151ralvaElU5DcEkwRhu5AT208/j8D1ayL8qtxRmyfO0sFIWnGvBA= 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 1742981779480647.7127441522938; Wed, 26 Mar 2025 02:36:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txN9s-0000ys-VX; Wed, 26 Mar 2025 05:34:48 -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 1txN9q-0000xl-66 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:46 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txN9o-0003X4-FH for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:45 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-22622ddcc35so14329555ad.2 for ; Wed, 26 Mar 2025 02:34:44 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 02:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742981682; x=1743586482; 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=th8ONn47n1N39VwqSrZXDPi4AfiPl05PuU27NT3wHrA=; b=EONQOk9AYgGTLyrbwjGomnL9WOcqW5yrmaf2a8rhcg2Z+glOkqDlDq0zR97GAWPVzM wAr07Y2XkFRJj5HUVib3mEiHL79ZC4/7qHzqhR1n6xjlxvRXlK5E8EHOj20znW1fOV1w VY2Y4a/cEvvoDnH9GA87l2J48e8TFCkGs7UwH3VUC1e/IeCvUVZjba+guSRLhOnT9YRZ vpu9erIX/M1F05i80OA1HpAuRHdvgYrU7oFlX3arTO+ii63W2Ufoyb01CoMGsLFPdHNd kgBxqfcEmfMrYhUQhZMUbh4A/6cXVX6t0oB+uuuVjDuY94MgDeS5Qx+bjcp0Qxekck6i LvAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742981682; x=1743586482; 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=th8ONn47n1N39VwqSrZXDPi4AfiPl05PuU27NT3wHrA=; b=mKN1bXu/m0OdqotD4V6csdoi9eoiRMoOmGrnZa/wbfDSNWsmP2AJTgXYvyHuEXZt98 JtNSuIhA0F3i9u0tILpS+m9l2HRpQluG6FfgYFYoxv/g1GLpoY2sXzs+z6+JpVkWPnvP WiAsjKILb+YEmE9Rfq1hbjoL3TDQcXUfuPXUbN9aGyCvNS39mwDb1UN7UpfavJSnI5Za xkWbaJA4K0/gx9BCW0ry0CONLUp6HB6URCCr0byHMVzZ9EcziShgdfje9K+JCSKiidxb zOc+SKZ2dy2Q8bBaVIeCRpTKVRK5huIeyTFb4rbxSlHQazBBX1LFLzBKIHBzBgU8Yr2A g96Q== X-Gm-Message-State: AOJu0YzVC3XlQGXj6XEj8w0ZFAAOfGZJ5K/EPoZB+gzOaBSLldLDWaVB 7CFfjtdzL31GLYVOgx48843wRlD4ks/MGWQ9dmcQLtp62nPpvCSAnasGUB1I X-Gm-Gg: ASbGnctdZ33Ybz2E5j3mc86fAw47AJV9rUzmKHs6WruY8hJzVgcF7B8gWZGgmHMMxzr 9AaHk8Y3guFrhrDOnMZki30RKATbX4kiXd5fFfKdkFsMt5zs1VYbteGriBca6n5PXdPqWakNkvq tI5ueF6sVFBrsap6UmiWlFWdoK0DTrmZ4BGFUfOqK+ipMZCqtJW6r26xUcQU8ULrYT48MYhTkpz ni9zYHOyF+IJtN6dmOg4LeDSHJSLIiruSQBRVuh3PAYVEmfvEOOsjsdYmCBTD9tNKO/euPUkxOO ok4/dakBzbeBQv+yc8GcMdGW/AkO24YeDgHSgjg6aKTlkSh1XrBO5/BWbBHklRpp0DrJqcebybw 8EzureRPphCZcECpl/Bkx X-Google-Smtp-Source: AGHT+IHaPVvPdserpOCVlBnFuoEp9navTALSTvk7t0Q+gzPtz42rR9AsPZ81HCxglpPg2ZVC9ybJ2g== X-Received: by 2002:a05:6a00:2ea0:b0:736:a8db:93b8 with SMTP id d2e1a72fcca58-739059803cfmr31423982b3a.3.1742981682046; Wed, 26 Mar 2025 02:34:42 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 3/6] ui/egl: use DRM_FORMAT_MOD_INVALID as default modifier Date: Wed, 26 Mar 2025 17:34:15 +0800 Message-ID: <20250326093418.397269-4-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-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=2607:f8b0:4864:20::629; envelope-from=yuq825@gmail.com; helo=mail-pl1-x629.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: 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 @gmail.com) X-ZM-MESSAGEID: 1742981781097019000 From: Qiang Yu 0 is used as DRM_FORMAT_MOD_LINEAR already. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Qiang Yu --- hw/display/vhost-user-gpu.c | 3 ++- hw/display/virtio-gpu-udmabuf.c | 4 +++- ui/egl-helpers.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index a7949c7078..a6a510db65 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -18,6 +18,7 @@ #include "chardev/char-fe.h" #include "qapi/error.h" #include "migration/blocker.h" +#include "standard-headers/drm/drm_fourcc.h" =20 typedef enum VhostUserGpuRequest { VHOST_USER_GPU_NONE =3D 0, @@ -251,7 +252,7 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) int fd =3D qemu_chr_fe_get_msgfd(&g->vhost_chr); uint32_t offset =3D 0; uint32_t stride =3D m->fd_stride; - uint64_t modifier =3D 0; + uint64_t modifier =3D DRM_FORMAT_MOD_INVALID; QemuDmaBuf *dmabuf; =20 if (m->scanout_id >=3D g->parent_obj.conf.max_outputs) { diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index 34fbe05b7a..de6ce53f16 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -25,6 +25,7 @@ #include #include "qemu/memfd.h" #include "standard-headers/linux/udmabuf.h" +#include "standard-headers/drm/drm_fourcc.h" =20 static void virtio_gpu_create_udmabuf(struct virtio_gpu_simple_resource *r= es) { @@ -187,7 +188,8 @@ static VGPUDMABuf &offset, &fb->stride, r->x, r->y, fb->width, fb->height, qemu_pixman_to_drm_format(fb->format), - 0, &res->dmabuf_fd, 1, true, false); + DRM_FORMAT_MOD_INVALID, &res->dmabuf_fd, + 1, true, false); dmabuf->scanout_id =3D scanout_id; QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next); =20 diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 432863d702..8c0e394d2b 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -23,6 +23,7 @@ #include "system/system.h" #include "qapi/error.h" #include "trace.h" +#include "standard-headers/drm/drm_fourcc.h" =20 EGLDisplay *qemu_egl_display; EGLConfig qemu_egl_config; @@ -333,7 +334,7 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) attrs[i++] =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; attrs[i++] =3D EGL_DMA_BUF_PLANE0_OFFSET_EXT; attrs[i++] =3D 0; - if (modifier) { + if (modifier !=3D DRM_FORMAT_MOD_INVALID) { attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT; attrs[i++] =3D (modifier >> 0) & 0xffffffff; attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT; --=20 2.43.0 From nobody Wed Apr 2 13:14:35 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=1742981734; cv=none; d=zohomail.com; s=zohoarc; b=Ore1BVD756h05gZAw5QvS7x1/grXwnM+YxlGBq3Zo73WXvFQUcusIm893sDkoKcyhM8H+WIx5Fk3A8oY3LXxJ8Vgu/ZnOUFIpYAwpAZkxBnEjKA+8+lZYxFjBOpT5jWg+b4dGWXpyqKqKhiLMtmyUmlCuhiAzGXDikVh2pMxXzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742981734; 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=dhtailQ7Al3m+Hnv6ZcWWutKFcS73lvQuxI+xweqSDk=; b=RTxj7oVOk/i9qO2MtBwGNWxdJsx1jy08h49tpaq/CYA2WitqJtk5fTslbJiZuleH5PwmlvkmlfQrg98SfWHONzgfovYjJG4FL8VEfEN9AMAhnwWuLSy9PtCg/E9tRXlfY8aPkyoXXGc0GPtxHjP8Dj4SgBCNghwfpWsEc4tzyEg= 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 1742981734672991.2117174647112; Wed, 26 Mar 2025 02:35:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txN9y-0000zC-K7; Wed, 26 Mar 2025 05:34: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 1txN9s-0000ye-Cm for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:48 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txN9q-0003XC-6p for qemu-devel@nongnu.org; Wed, 26 Mar 2025 05:34:48 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-227b828de00so62259475ad.1 for ; Wed, 26 Mar 2025 02:34:45 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 02:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742981684; x=1743586484; 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=dhtailQ7Al3m+Hnv6ZcWWutKFcS73lvQuxI+xweqSDk=; b=hD0FUN1t6JHiLRPvbHKEImov8BFzbANoZ2W4TLa4vzIZSKJxRsipVMPCwpObA71nE0 jpjde0W3DhhrvKPKwBmrqQzsfXsO5d7B/ehkoV+fmx1gqWRLhFhnWAbwEyHYYRr789It P+T0hgNE39iBEdFVxWIUaUD3jaZxbW4fZlHFbioiuuDp2c+5OQXvyQmIYXmRQ34zHDTe Ff7unuE+9lQg5IAjZyD4pAqbyvBGgj7fW2r4k2zeIzRzP/qrYbYcN4HaCE6fnNnLJ/j7 89S4cXDYpVIufPKvvBIAWpvBiJ4zCeCtggwrWOWMBTUmXo9Xdej2QyMjrgacGoI/Nxew 5qBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742981684; x=1743586484; 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=dhtailQ7Al3m+Hnv6ZcWWutKFcS73lvQuxI+xweqSDk=; b=MU/JxLIjljC5CtKSTiVDI8zQWYxLG1m/nQ/B0HScH+kjvmarPaGjC875YI359omtXl Dgl6I9r+ru+1J8l1YV4owdq4D/S2jnvJDNFBV95EbYcQ1UVkqauhgv/yH5FWK/OvV+DH a0htdhKxI+Kv4eqKTBCN+Yc3QTGp42ker0nFs0IEaLoRow2Rw+SKHwIx0oMJYnd3OfTI LFmq/pCuRXRT7xh6e38t0sxL73hz6bv8k6EApzxE4cqBN/pJX3Yuj7YVSTf2AWdAcgdU F2cloTf8KKtIUsloVZ0MqwUYQJN5oRmpkgAN3st5CaBYWIH3t0L2GkM08MB1jZuCP2Jd 3l/w== X-Gm-Message-State: AOJu0YyBZio1QsvR2Ggy6haq+4Vtiuox3zRazRx+3tsiCJ/oK5fIhfVs hmLfrgU2Yylvq+lGQ1rNBWrB6/rw8NhGmKkM6AA9JAJGHuPL4qX+AXZwW48+ X-Gm-Gg: ASbGncs/vb6sYSTx0uefYHZ1diHnEAiECtJ3o8Lr3V2I1NuqwGXAFk8mFdLNJxdEqZJ VcKS8rFK4oWZpkThM4Qc1xeGNoXnUH4mVBzh6Ko3zFvHZrbFS1z7sTt8VPky3GQLkqgJDOOI6FG mCSi4ucL/4SO4oK9EpbP1Ss3ofj+v4Ae4fJVl2YLWf6V++cuFSD1Lfomfl0/ziqST5x510rv+4R i+z5+cichCRG2TGUuVjBh+ib9UHsjENDiQZVu9odWPOMTzAKX0X/QbKt4J7X87Xfa3ew5FkWgoP vRDCKSens9L6TYh6i8/BncI+F/tVJhCH3YAfVLgIYqN4eRJ7ZCOJiqE8xWZSwr9xgPb+w24a/2J 7KhSlVfBW1X21su7kpqdG X-Google-Smtp-Source: AGHT+IEb7oIzpxmEDQaLoS1jily73MZ2+hgsSe1LVGWx75obOqykmQZMeix/n1Q4boMl0No/ZHxgSA== X-Received: by 2002:a05:6a00:2d91:b0:736:8c0f:774f with SMTP id d2e1a72fcca58-73905a50265mr25969859b3a.22.1742981684130; Wed, 26 Mar 2025 02:34:44 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu Subject: [PATCH v2 4/6] ui/egl: support multi-plane dmabuf when egl export/import Date: Wed, 26 Mar 2025 17:34:16 +0800 Message-ID: <20250326093418.397269-5-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::633; envelope-from=yuq825@gmail.com; helo=mail-pl1-x633.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: 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 @gmail.com) X-ZM-MESSAGEID: 1742981737125019000 Content-Type: text/plain; charset="utf-8" From: Qiang Yu v2: * use new dmabuf API and check length Signed-off-by: Qiang Yu Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/ui/egl-helpers.h | 5 ++- ui/dbus-listener.c | 19 +++++---- ui/egl-helpers.c | 91 ++++++++++++++++++++++++++++++---------- ui/spice-display.c | 58 ++++++++++++++++--------- 4 files changed, 121 insertions(+), 52 deletions(-) diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index 4b8c0d2281..fb80e15142 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -46,8 +46,9 @@ extern int qemu_egl_rn_fd; extern struct gbm_device *qemu_egl_rn_gbm_dev; =20 int egl_rendernode_init(const char *rendernode, DisplayGLMode mode); -int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc, - EGLuint64KHR *modifier); +bool egl_dmabuf_export_texture(uint32_t tex_id, int *fd, EGLint *offset, + EGLint *stride, EGLint *fourcc, int *num_pl= anes, + EGLuint64KHR *modifier); =20 void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf); void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 65373d519c..90147972cd 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -504,19 +504,22 @@ static void dbus_scanout_texture(DisplayChangeListene= r *dcl, backing_width, backing_height, x, y, w, h); #ifdef CONFIG_GBM g_autoptr(QemuDmaBuf) dmabuf =3D NULL; - int fd; - uint32_t offset =3D 0, stride, fourcc; + int fd[DMABUF_MAX_PLANES], num_planes; + uint32_t offset[DMABUF_MAX_PLANES], stride[DMABUF_MAX_PLANES], fourcc; uint64_t modifier; =20 assert(tex_id); - 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__); + if (!egl_dmabuf_export_texture(tex_id, fd, (EGLint *)offset, (EGLint *= )stride, + (EGLint *)&fourcc, &num_planes, &modifi= er)) { + 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, 1, + 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); =20 dbus_scanout_dmabuf(dcl, dmabuf); diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 8c0e394d2b..f76d0c04a2 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -283,44 +283,85 @@ err: return -1; } =20 -int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc, - EGLuint64KHR *modifier) +bool egl_dmabuf_export_texture(uint32_t tex_id, int *fd, EGLint *offset, + EGLint *stride, EGLint *fourcc, int *num_pl= anes, + EGLuint64KHR *modifier) { EGLImageKHR image; - EGLint num_planes, fd; + EGLuint64KHR modifiers[DMABUF_MAX_PLANES]; =20 image =3D eglCreateImageKHR(qemu_egl_display, eglGetCurrentContext(), EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(unsigned long)tex_id, NULL); if (!image) { - return -1; + return false; } =20 eglExportDMABUFImageQueryMESA(qemu_egl_display, image, fourcc, - &num_planes, modifier); - if (num_planes !=3D 1) { - eglDestroyImageKHR(qemu_egl_display, image); - return -1; - } - eglExportDMABUFImageMESA(qemu_egl_display, image, &fd, stride, NULL); + num_planes, modifiers); + eglExportDMABUFImageMESA(qemu_egl_display, image, fd, stride, offset); eglDestroyImageKHR(qemu_egl_display, image); =20 - return fd; + /* Only first modifier matters. */ + if (modifier) + *modifier =3D modifiers[0]; + + return true; } =20 void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) { EGLImageKHR image =3D EGL_NO_IMAGE_KHR; EGLint attrs[64]; - int i =3D 0; + int i =3D 0, j; uint64_t modifier =3D qemu_dmabuf_get_modifier(dmabuf); uint32_t texture =3D qemu_dmabuf_get_texture(dmabuf); + 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); + + EGLint fd_attrs[] =3D { + EGL_DMA_BUF_PLANE0_FD_EXT, + EGL_DMA_BUF_PLANE1_FD_EXT, + EGL_DMA_BUF_PLANE2_FD_EXT, + EGL_DMA_BUF_PLANE3_FD_EXT, + }; + EGLint offset_attrs[] =3D { + EGL_DMA_BUF_PLANE0_OFFSET_EXT, + EGL_DMA_BUF_PLANE1_OFFSET_EXT, + EGL_DMA_BUF_PLANE2_OFFSET_EXT, + EGL_DMA_BUF_PLANE3_OFFSET_EXT, + }; + EGLint stride_attrs[] =3D { + EGL_DMA_BUF_PLANE0_PITCH_EXT, + EGL_DMA_BUF_PLANE1_PITCH_EXT, + EGL_DMA_BUF_PLANE2_PITCH_EXT, + EGL_DMA_BUF_PLANE3_PITCH_EXT, + }; + EGLint modifier_lo_attrs[] =3D { + EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, + EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, + EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, + EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, + }; + EGLint modifier_hi_attrs[] =3D { + EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, + EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, + EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, + EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, + }; =20 if (texture !=3D 0) { return; } =20 + assert(nfds >=3D num_planes); + assert(noffsets >=3D num_planes); + assert(nstrides >=3D num_planes); + attrs[i++] =3D EGL_WIDTH; attrs[i++] =3D qemu_dmabuf_get_backing_width(dmabuf); attrs[i++] =3D EGL_HEIGHT; @@ -328,18 +369,22 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) attrs[i++] =3D EGL_LINUX_DRM_FOURCC_EXT; attrs[i++] =3D qemu_dmabuf_get_fourcc(dmabuf); =20 - attrs[i++] =3D EGL_DMA_BUF_PLANE0_FD_EXT; - attrs[i++] =3D qemu_dmabuf_get_fds(dmabuf, NULL)[0]; - attrs[i++] =3D EGL_DMA_BUF_PLANE0_PITCH_EXT; - attrs[i++] =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; - attrs[i++] =3D EGL_DMA_BUF_PLANE0_OFFSET_EXT; - attrs[i++] =3D 0; - if (modifier !=3D DRM_FORMAT_MOD_INVALID) { - attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT; - attrs[i++] =3D (modifier >> 0) & 0xffffffff; - attrs[i++] =3D EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT; - attrs[i++] =3D (modifier >> 32) & 0xffffffff; + for (j =3D 0; j < num_planes; j++) { + attrs[i++] =3D fd_attrs[j]; + /* fd[1-3] may be -1 if using a joint buffer for all planes */ + attrs[i++] =3D fds[j] >=3D 0 ? fds[j] : fds[0]; + attrs[i++] =3D stride_attrs[j]; + attrs[i++] =3D strides[j]; + attrs[i++] =3D offset_attrs[j]; + attrs[i++] =3D offsets[j]; + if (modifier !=3D DRM_FORMAT_MOD_INVALID) { + attrs[i++] =3D modifier_lo_attrs[j]; + attrs[i++] =3D (modifier >> 0) & 0xffffffff; + attrs[i++] =3D modifier_hi_attrs[j]; + attrs[i++] =3D (modifier >> 32) & 0xffffffff; + } } + attrs[i++] =3D EGL_NONE; =20 image =3D eglCreateImageKHR(qemu_egl_display, diff --git a/ui/spice-display.c b/ui/spice-display.c index 40547edb5e..d7ebb3682d 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -876,19 +876,24 @@ static void spice_gl_switch(DisplayChangeListener *dc= l, struct DisplaySurface *new_surface) { SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); - EGLint stride, fourcc; - int fd; =20 if (ssd->ds) { surface_gl_destroy_texture(ssd->gls, ssd->ds); } ssd->ds =3D new_surface; if (ssd->ds) { + uint32_t offset[DMABUF_MAX_PLANES], stride[DMABUF_MAX_PLANES]; + int fd[DMABUF_MAX_PLANES], num_planes, fourcc; + surface_gl_create_texture(ssd->gls, ssd->ds); - fd =3D egl_get_fd_for_texture(ssd->ds->texture, - &stride, &fourcc, - NULL); - if (fd < 0) { + if (!egl_dmabuf_export_texture(ssd->ds->texture, fd, (EGLint *)off= set, + (EGLint *)stride, &fourcc, &num_pla= nes, NULL)) { + surface_gl_destroy_texture(ssd->gls, ssd->ds); + return; + } + + if (num_planes > 1) { + fprintf(stderr, "%s: does not support multi-plane texture\n", = __func__); surface_gl_destroy_texture(ssd->gls, ssd->ds); return; } @@ -899,10 +904,10 @@ static void spice_gl_switch(DisplayChangeListener *dc= l, fourcc); =20 /* note: spice server will close the fd */ - spice_qxl_gl_scanout(&ssd->qxl, fd, + spice_qxl_gl_scanout(&ssd->qxl, fd[0], surface_width(ssd->ds), surface_height(ssd->ds), - stride, fourcc, false); + stride[0], fourcc, false); ssd->have_surface =3D true; ssd->have_scanout =3D false; =20 @@ -941,20 +946,24 @@ static void qemu_spice_gl_scanout_texture(DisplayChan= geListener *dcl, void *d3d_tex2d) { SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); - EGLint stride =3D 0, fourcc =3D 0; - int fd =3D -1; + EGLint offset[DMABUF_MAX_PLANES], stride[DMABUF_MAX_PLANES], fourcc = =3D 0; + int fd[DMABUF_MAX_PLANES], num_planes; =20 assert(tex_id); - fd =3D egl_get_fd_for_texture(tex_id, &stride, &fourcc, NULL); - if (fd < 0) { - fprintf(stderr, "%s: failed to get fd for texture\n", __func__); + if (!egl_dmabuf_export_texture(tex_id, fd, offset, stride, &fourcc, + &num_planes, NULL)) { + fprintf(stderr, "%s: failed to export dmabuf for texture\n", __fun= c__); + return; + } + if (num_planes > 1) { + fprintf(stderr, "%s: does not support multi-plane dmabuf\n", __fun= c__); return; } trace_qemu_spice_gl_scanout_texture(ssd->qxl.id, w, h, fourcc); =20 /* note: spice server will close the fd */ - spice_qxl_gl_scanout(&ssd->qxl, fd, backing_width, backing_height, - stride, fourcc, y_0_top); + spice_qxl_gl_scanout(&ssd->qxl, fd[0], backing_width, backing_height, + stride[0], fourcc, y_0_top); qemu_spice_gl_monitor_config(ssd, x, y, w, h); ssd->have_surface =3D false; ssd->have_scanout =3D true; @@ -1064,15 +1073,26 @@ static void qemu_spice_gl_update(DisplayChangeListe= ner *dcl, /* dest framebuffer */ if (ssd->blit_fb.width !=3D width || ssd->blit_fb.height !=3D height) { + int fds[DMABUF_MAX_PLANES], num_planes; + uint32_t offsets[DMABUF_MAX_PLANES], strides[DMABUF_MAX_PL= ANES]; + 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, width, height); - fd =3D egl_get_fd_for_texture(ssd->blit_fb.texture, - &stride, &fourcc, NULL); - spice_qxl_gl_scanout(&ssd->qxl, fd, width, height, - stride, fourcc, false); + if (!egl_dmabuf_export_texture(ssd->blit_fb.texture, fds, + (EGLint *)offsets, (EGLint = *)strides, + &fourcc, &num_planes, NULL)= ) { + fprintf(stderr, "%s: failed to export dmabuf for textu= re\n", __func__); + return; + } + if (num_planes > 1) { + fprintf(stderr, "%s: does not support multi-plane dmab= uf\n", __func__); + return; + } + spice_qxl_gl_scanout(&ssd->qxl, fds[0], width, height, + strides[0], fourcc, false); } } else { stride =3D qemu_dmabuf_get_strides(dmabuf, NULL)[0]; --=20 2.43.0 From nobody Wed Apr 2 13:14:35 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= (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 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 ) 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 ) 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 ) 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 ; 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?= , Qiang Yu 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: 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 @gmail.com) X-ZM-MESSAGEID: 1742981789216019000 Content-Type: text/plain; charset="utf-8" From: Qiang Yu To handle multi plane. v2: * use new dmabuf API and check length Signed-off-by: Qiang Yu --- 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 @@ =20 + + + + + + + + + + + + + + + + + +