From nobody Tue Apr 1 07:40:29 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=1742804436; cv=none; d=zohomail.com; s=zohoarc; b=TUapjNINYDo7VKLx1AX9SLtUM+4xmru1S5x69G0LCS/Zn+zhV8y6Xg306gFufNVEB1WErkA5PEFbsVm4FsSiI0mU8/9FsWHNedJ0mj3YOZoyZCV3AGtmnQRuaUZdKzxuqUAgSXsyhOSa6CWymaqgGPGHE+fq+OUkojCeGEi0fCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742804436; 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=euNdCVq4nnuvJitoikcBPMwBYVw2NPIet0QQQCOfFzo=; b=l/s+0rPaIe1hy/ysBaVeSqYbFGmi5LRHaHF5p5LXoVhLxcOrfDHnFlrNcAyHEV2/QaPkNrb83WNojS7xQVC1KOQ//4sdcJSm8XqZOT3ZQMCGJTDZjcdp5lOLkYnXzz0ZwLT3rqyLyr+jQk14jZNaqNC9rtdRU24fl3MgIFxNU4A= 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 1742804436897168.82014366496696; Mon, 24 Mar 2025 01:20:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twd2B-0005x6-Et; Mon, 24 Mar 2025 04:19:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twd27-0005wF-NE for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twd24-0008U3-I1 for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:42 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-224191d92e4so74492675ad.3 for ; Mon, 24 Mar 2025 01:19:39 -0700 (PDT) Received: from localhost.localdomain (awork062150.netvigator.com. [203.198.28.150]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm64717685ad.252.2025.03.24.01.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 01:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742804378; x=1743409178; 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=euNdCVq4nnuvJitoikcBPMwBYVw2NPIet0QQQCOfFzo=; b=PB/CkLQLtuxXoQP2fLzvF7iNR14OwmQqgum9qeEW+00tMF4DLub7BSzTvG3Z/eQYvK IqNV4hZvv1/ImJ2Uug213meNa06KDk/jh1T/H59pQceM5KkBOnpozSqZqTiRZvV2hRQG oqQq2vyJV/90jbvRfBovFtFnNxH9H4xKkW6lzfxrVz/GKLOHd6xPwCMFuQch750u7ilg zJ6/VacCF0rjBrrPJVnPUIb7m+ueIee8TgR7l2C7BlhxpKE74c8c0LAyJH/zIzkphfZ9 aDbZCmodW3UD/zEqGoRx5G6s+snWXCOX9+UXN8i+4B9kJ6/vtKz89/mvRXYfz+k2AEFA 42VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742804378; x=1743409178; 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=euNdCVq4nnuvJitoikcBPMwBYVw2NPIet0QQQCOfFzo=; b=VPcIPyEhGPUas2vKynfoDS2xxGXklneK4pbtoVO2pHrx1zf/SF9hTKMbqGHAMayc2i pU4tQpQaJJWS5wwxJ9G02yBg77MqYmAJz2z8U62/dgC6PnBRHKZSxMeVgPc9F5pzqdTp 4u9QyrTDbhGHBX9oNt7vAxQXfbBbCUAnl/ECwFBNLpX4Ojp83SKJFPinyxjG0mlb5bnb OGHYkmjhxJmd56CuMcmqqs7EldJF3HO90q17Fbn20h1aoNciNhS2tQzAL0K1jJrF1A8X Y7e3DNm7YymPMUNgivoQJbVSMlZg6fm4311ql1+lQzQE+xILPk6uuZZD8v8i0uhOw396 A4Cw== X-Gm-Message-State: AOJu0YyIKyCFSW5vW4IGWZ6e4sMwhoIPtoKmu51OEwsks+x6Qq7sPsiQ KDAe8Ab00dGO0Paqey1Zt2BllYBlxcugJQpeVr45qkVsG9nu9fLnUpE+t6wF X-Gm-Gg: ASbGnct1AX7eMW1moEyKC93P3RItKMgVX6N3PkgRyUAIJIuZuP56+X7WPVEQI74aXwn DxZ37HVD5XdeDdvUxiE12KD6IL+wB/pzXwtawCt3/9BC6XFy9kwqvzmVWhO8WRdjRk+l7AKAY+A Eht2nXUKn4OOBPR2asQkI78wRUDZwhJd05rQEGmU+Aw1/fBnLJ9+DSrVRRbk7Ek7zVJsOR1AvzM XEGmC/ah//UnokzXC25QspEPvJFWoroCQDTjLYEBppL82+V5Nq+6OMVTD+Xz/i96wJrkNkxFngd N15zyCnbrxGeuxDsv7GX4ieTXyJCNyV4drOPd0bEuDKQKQ8avh9m4tTZMRM/872jmZpcuKaw5IW thqhuAxu/+NjfAZpK8mLo X-Google-Smtp-Source: AGHT+IG+Mnv8Q/E6f2slG1au3MDOsIr5i9HLgjzwrKRCkJLnKT0+1WgHnzKLr6ztDqm/oo19rTq91Q== X-Received: by 2002:a17:903:230d:b0:21f:4b01:b978 with SMTP id d9443c01a7336-22780e3fd0amr199069715ad.36.1742804377836; Mon, 24 Mar 2025 01:19: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 1/6] ui/dmabuf: extend QemuDmaBuf to support multi-plane Date: Mon, 24 Mar 2025 16:19:16 +0800 Message-ID: <20250324081922.359369-2-yuq825@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324081922.359369-1-yuq825@gmail.com> References: <20250324081922.359369-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::62f; envelope-from=yuq825@gmail.com; helo=mail-pl1-x62f.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: 1742804437882116600 Content-Type: text/plain; charset="utf-8" From: Qiang Yu mesa/radeonsi is going to support explicit midifier 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. Signed-off-by: Qiang Yu --- 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 | 67 +++++++++++++++++++++------------ ui/egl-helpers.c | 4 +- ui/spice-display.c | 4 +- 8 files changed, 76 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..407fb2274e 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_fd(QemuDmaBuf *dmabuf); +void qemu_dmabuf_dup_fd(QemuDmaBuf *dmabuf, int *fd); 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_offset(QemuDmaBuf *dmabuf); +const uint32_t *qemu_dmabuf_get_stride(QemuDmaBuf *dmabuf); +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..3b39a23846 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_fd(dmabuf)[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_stride(dmabuf)[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..c4eb307042 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,35 @@ void qemu_dmabuf_free(QemuDmaBuf *dmabuf) g_free(dmabuf); } =20 -int qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf) +const int *qemu_dmabuf_get_fd(QemuDmaBuf *dmabuf) { assert(dmabuf !=3D NULL); =20 return dmabuf->fd; } =20 -int qemu_dmabuf_dup_fd(QemuDmaBuf *dmabuf) +void qemu_dmabuf_dup_fd(QemuDmaBuf *dmabuf, int *fd) { + int i; + assert(dmabuf !=3D NULL); =20 - if (dmabuf->fd >=3D 0) { - return dup(dmabuf->fd); - } else { - return -1; + for (i =3D 0; i < dmabuf->num_planes; i++) { + fd[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 +118,27 @@ 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_offset(QemuDmaBuf *dmabuf) +{ + assert(dmabuf !=3D NULL); + + return dmabuf->offset; +} + +const uint32_t *qemu_dmabuf_get_stride(QemuDmaBuf *dmabuf) { assert(dmabuf !=3D NULL); =20 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 +246,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..72a1405782 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_fd(dmabuf)[0]; attrs[i++] =3D EGL_DMA_BUF_PLANE0_PITCH_EXT; - attrs[i++] =3D qemu_dmabuf_get_stride(dmabuf); + attrs[i++] =3D qemu_dmabuf_get_stride(dmabuf)[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..82598fe9e8 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_stride(dmabuf)[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_fd(dmabuf, &fd); =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 Tue Apr 1 07:40:29 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=1742804484; cv=none; d=zohomail.com; s=zohoarc; b=iFqMXds1qZ3XyqsF2G/XWCkMkVl1/Dh8Q457YF307re+YsbnGkc/efCq5EwLYX+6miytqI/54mdI0VU/j6qswDwKl1DkU3rJweTu/EEeG7Kge5483Re92A34x26AlmFSBWPrnHAlwJtY7lldL7bjhCu4S65WW0dBK+dR8EBl1i8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742804484; 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=CX3LCBnlWo3L0OhbMJDGZVsE/frfpvzUUAqMxsgq760=; b=PI+80C8g7QWG4nPrKStXzcpuEA8Fx7YUB8g2oqLTuX6uzFU6+9+9L4GVPgjeAj6NcsrOyZw/9muLn6FvUDuC+RvJvMytgn0MMEH7nGqnkn6ArdV4lQHGeZtKdhVtAM9lW8iP143SoWlNACqB9XWTkZSoI0QDOHWr+YKLtGHNbpc= 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 1742804484370806.3544708089136; Mon, 24 Mar 2025 01:21:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twd30-0006IZ-31; Mon, 24 Mar 2025 04:20:41 -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 1twd29-0005wR-0H for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:45 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twd26-0008UG-SV for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:44 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-224341bbc1dso73076785ad.3 for ; Mon, 24 Mar 2025 01:19:42 -0700 (PDT) Received: from localhost.localdomain (awork062150.netvigator.com. [203.198.28.150]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm64717685ad.252.2025.03.24.01.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 01:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742804381; x=1743409181; 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=CX3LCBnlWo3L0OhbMJDGZVsE/frfpvzUUAqMxsgq760=; b=P1XwqQzSf9L0B5ZknFamIlmgnMolL78ve07nJ1fCqPLcTNi7WX5B4B9x6Rhpr/KMEZ PRXFBIYo+xOdAD1DDF3gF4IMsP+gMWO6IdXKrSMWufcC4hb3IPF+kB7Ka2S93NJSbnh/ pok7o4VWj9YjxD48uPi5MhzgNSXCC2HM4ejPGbBZQOf2WvIntMIqSXAgTpx1AmRdZVRe vq1B0FX73HA68AH58ZtOWDuCQpk8PibWKluw9xWeY2Ce8TuI1E9EMBymiqyYoAs/ayFw IYDPh9JkX0U3lfskTWXpwDkZFySxDVtPTEqwweqf/J6ye1/BKrcA0eLfyVOMQNBmeupP J2vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742804381; x=1743409181; 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=CX3LCBnlWo3L0OhbMJDGZVsE/frfpvzUUAqMxsgq760=; b=jVpB8zMSxnhivkWOIwj9PqHWU3218kI18gA9Meud454wDIeEMM/wgzDIuOKKzbA/Yc BUo6s0kXTdcvD81Mvcu1wMDiNOsswbUX1FkZJjYRbR8odpsLhCGQe08hOvEJSOCfEUaG eykI/KCJnuO6xbxJdarkRIQVZuvUhQrN6+6fycXL7hCP6RG9Ig8lLOeyMOGglmN44oYe W2yyqRX9a/VChqGDKdh+RrScyQh/SVHNVHKqvWbXmDRoCeVIsBdwrCGVcI+elZJIWXe0 6XhfI4iynW8GAD57a4cIyTrzo/m+v1qlr1oQDTayopo3TQpElE2IpfeBUCoXvMeUi+GX 7oug== X-Gm-Message-State: AOJu0YxhBCBxvV5BU7OlwNYp3nrn4vj3qC6/3cnOxVXHoep0jJXtLzMy aAPocdwqN3Ro2acp1cik6aPTFKgZGdyLG6xWZ/pjO/+pC/xozzoHyfE2xNRR X-Gm-Gg: ASbGncsIDQDHYzoLh/MlsvZtJKEhKDMpoJIvBx3rbEnS7xspe8iqQXcSCH/PvfvsOcc +23lZlkYT6Yn9bJhbNm7Y1kf+RaCRikuaKazWk/nmjGg+f5mv2cqZMcrEzfYryMoatXTnoqH6GQ rHEnMES6Yh15xWTTy8CtelwwMva46QkUyeb8cUawOeZ9Yi+qsIt+x10bID/+pzADc2YKQoQK4Rc UyZgB3T4dy5ZcaHyRcS9lmP0D1gR+zSfPBaZ1ILnrd59f7AAO3r8XmgMu3sYGNJ0TAgZMSUFyYM D4lKCfEG/Lp8R7P46RrxssLyQCwjEQxpkiJlRMlzUzLPY0KpskFnioHnKpXxR2wBEMpQsZKdNx0 7s+tIYOmgIrVqCTBQ6igV X-Google-Smtp-Source: AGHT+IG/XdccdoLiPWfQ8qMZl0lG00DL8ZVvdp3e+/2bhlueGXUeZ3i7PPgoTZW4oo6aftm+evx9Ug== X-Received: by 2002:a17:903:98d:b0:223:5e76:637a with SMTP id d9443c01a7336-22780d980fcmr198374405ad.23.1742804380580; Mon, 24 Mar 2025 01:19:40 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu Subject: [PATCH 2/6] ui/egl: require EGL_EXT_image_dma_buf_import_modifiers Date: Mon, 24 Mar 2025 16:19:17 +0800 Message-ID: <20250324081922.359369-3-yuq825@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324081922.359369-1-yuq825@gmail.com> References: <20250324081922.359369-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::62c; envelope-from=yuq825@gmail.com; helo=mail-pl1-x62c.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: 1742804486278116600 Content-Type: text/plain; charset="utf-8" From: Qiang Yu It's used already, just check it explicitly. Signed-off-by: Qiang Yu --- 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 72a1405782..45b1b0b700 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_stride(dmabuf)[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 Tue Apr 1 07:40:29 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=1742804491; cv=none; d=zohomail.com; s=zohoarc; b=RRoVXcOYK/osu9H5k/1+N0PKV9/ykxKFlQgI6mG3W0P7jRLnL/qVLImm6AdldQov4r7wPhsEExAZGVwckEOvYEvCGVV15BSPNfttOltPDYAxpfvxR60fEAi2+ts38hZlAswbErCl+juspOlsTOHh1ZM92KQxo6TqR8+Fz6xWGyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742804491; 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=VjHWsm3dx0YdITjXUi4M45f/K0Yu/f7nUohwYX78sQ4=; b=cmvrYEILlF74+jxK+9g0CKYhQB6z4HqZiHKHWiClq1ix3XRLcVs/TJ4gvZE7b4FopO9LlcdvDSVt3fdh+u4YPZ7yRwT8xEKxlPVvTrIZZ6rLkf4Dw7afOCPU0wfbnxxmGYHc2PvxXGp0QW6hGd156bL/tH8hJDABFaS1vVE8+Zk= 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 17428044913654.2697848853590585; Mon, 24 Mar 2025 01:21:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twd2I-0005y0-7s; Mon, 24 Mar 2025 04:19: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 1twd2D-0005xH-VS for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:50 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twd2A-0008UW-Gm for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:49 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-223fb0f619dso78751135ad.1 for ; Mon, 24 Mar 2025 01:19:44 -0700 (PDT) Received: from localhost.localdomain (awork062150.netvigator.com. [203.198.28.150]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm64717685ad.252.2025.03.24.01.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 01:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742804383; x=1743409183; 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=VjHWsm3dx0YdITjXUi4M45f/K0Yu/f7nUohwYX78sQ4=; b=E11K1VlVXdc3J45pqvFLEdDzq23XF+vNNX3FL8gAWFbuw1XBcP9rGKcqDh08f9gN4I VsXLbprRRGp2u4eqoJ1pgeFZqzwbFPxI0q9e6KcRN9GwkDndC+bajCJkg/HqXF0Mcice mp4PHFRBgz9XckA16PaxIMDUL0PP6LvhgGUvHDd72JN20RIIfxeDYFGZsi/oh6V0re2q PvrK1UTCb03Sg+2TQVi9hlN+NrcxiYGWs/iVEZpQ5tzt2Zi9hawCqYdaQTALozX80OmI xmeFDSlg0nklgE8drw2guBvo+HoHgV3pVi6/+ZnNPHdpPAsunic1u4CgRHhGWXLBy/O2 511A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742804383; x=1743409183; 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=VjHWsm3dx0YdITjXUi4M45f/K0Yu/f7nUohwYX78sQ4=; b=tDqQmGVZPqu9QGlvDoLObOHNSe03p2iG9DM0f758Sb5tHi4BDge0RfaBoRm2IAGKQz /IqG3TSlLVmaUpkitGtfBcbQX8ELYYTXJmris2hBRB2tXrwI+70jtxLrhxks6V2fC9L5 5h9E4xNRbrXPmocz0dfRNFLE41uMpF+TUKD05phGohSOCRkDkewhPVIpYKEaevi4gYaz 7Gctg3qZE/vD7kZO+/SYf8WZN80eA03InZSTisnuV2LfkdB0qzLuFi9ZvU5dPhynL0QQ Kqfa6C1zl1Dm9tuNYYHa2Y30Dpy2TkvEXZ2JPCe2PfY0OXo9vP9yDEu41Qg8bLh2ykci NUbw== X-Gm-Message-State: AOJu0YwBZIwS1Ue6/hYbQi7kM/VDNd5DMwoKRFzdpl93sPdN3N7K3ddw FqEIJafNikxcefMv1MF6d6+JlR9E+CaOsCL5c+04AOX5Zci4npG8u2YxXgrX X-Gm-Gg: ASbGnct7ZCkpeJYM/DBo4MWPSMvCjN379OCSslBavEcz+iLw44TBjpk290PSPro7ZVq dNGFh8WcUdFvoNk3w2tIsfWuLFPT/biAyRFzfg82R+KCanDnobrXOYRkl9HqRZh5L+r50QEGsXz lZ22f7BQYn/bt/3ccUgAo4bZo4lQm3Sat+UlCUw3Sde3Msh8yazkah0om1q/WNvpZV/QK4rd37K yu0JLy8kC4pywPYQNTzs7adgc5vboOP2dbu3aWRdj3lO5pAkEyI02T6joIAiJImOn0tHcalMYH9 9edt9QOiON5yUQlHWL0PHaSfNMvtoAmt5WelQMgln0HYpQmi+t5wQvy9K+Lv3vnXZs9ilH/rlDF Q2+WzQkcIiyhq+aAE4fNB X-Google-Smtp-Source: AGHT+IFt36h/z8Y2C2iMDjfKnXELWBvzzCrnRKytF6Y6K1DFOCuBs339dO+RqY7qVATO1/els3HspA== X-Received: by 2002:a17:902:cece:b0:221:7eae:163b with SMTP id d9443c01a7336-22780e261e7mr195628115ad.46.1742804383216; Mon, 24 Mar 2025 01:19:43 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu Subject: [PATCH 3/6] ui/egl: use DRM_FORMAT_MOD_INVALID as default modifier Date: Mon, 24 Mar 2025 16:19:18 +0800 Message-ID: <20250324081922.359369-4-yuq825@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324081922.359369-1-yuq825@gmail.com> References: <20250324081922.359369-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::634; envelope-from=yuq825@gmail.com; helo=mail-pl1-x634.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: 1742804492515116600 Content-Type: text/plain; charset="utf-8" From: Qiang Yu 0 is used as DRM_FORMAT_MOD_LINEAR already. Signed-off-by: Qiang Yu Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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 45b1b0b700..970286325f 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_stride(dmabuf)[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 Tue Apr 1 07:40:29 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=1742804437; cv=none; d=zohomail.com; s=zohoarc; b=Umn/cQB4t0yOxtI4vLEgFdHXmOXNiaTS1ZaGSofwxqV2NwyHbJCpk7bN7gnqQgV1e9+d3sYyD7Qlxcn16Wiy+/dEQMQJeqxUz+Nd80Op2JivXUbXJ007uJD8PLlRMYd18ro/aCpZC+S7XN0KyH2MkkcYQxDjYDbBwe3upheE6Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742804437; 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=zBnLYbHY4vG69xrvg+jj2XQI75wXpC82JycuCtb/2TU=; b=FWvLwr2fn75Lkd1lFwzHgFEs73fDhC/co0PnNmuQlp1i5DjAk2Ld6JTTxjCe6uZ3RHxrt0+R92IzcuyiNLB7Pq+57vfJNbHyk94Y9zkKwTSGW72ti7R3zGNlLRCW31qdoKRzk0x30tgisLGmwgIwPFdCXYVPvVSwMDCLy6HbGEE= 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 1742804437558237.80094541705262; Mon, 24 Mar 2025 01:20:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twd2P-0005z9-99; Mon, 24 Mar 2025 04:20:01 -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 1twd2G-0005xs-5q for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:52 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twd2D-0008V9-NU for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:51 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-224019ad9edso99941065ad.1 for ; Mon, 24 Mar 2025 01:19:48 -0700 (PDT) Received: from localhost.localdomain (awork062150.netvigator.com. [203.198.28.150]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm64717685ad.252.2025.03.24.01.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 01:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742804387; x=1743409187; 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=zBnLYbHY4vG69xrvg+jj2XQI75wXpC82JycuCtb/2TU=; b=djDI2RRCdqPbm4uk6+IxaHILN/G7kZqYeznPH+TuW1S7juZmQWHVWPwKnHixMgKWU6 K+zH1Jync0InEClDy5msnHmPjDzFDqLnmPzA4ySAg+eM7igePkYdOkqOzuCV7BtsEkPY DoUiCtWBL+nc2obTjxphue4RNQqH3RUhvfLy/qmmvcZ5+gsBYV11ZHuesHcnRm1EwxfP E0PQBGzB/ztUU4Ermkq/tCz/cjAyotLu5TiVm+5i3I0sJIwZiyUjtp4qrJgL4gJyGs4J YgoxE3L/aNOlJMCsvd+dVdS9iG0JFVS/jDZAOr6+Eix8KISnvADsMc2COkRlsdv7ks2Q NUWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742804387; x=1743409187; 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=zBnLYbHY4vG69xrvg+jj2XQI75wXpC82JycuCtb/2TU=; b=Q0/S7lodcwlUuAN7xrALMcTeWF2p+DBbFd9q0pZn2YncTpRtFbS7/GCEIFUVSpeRbN h2OEFr7YuUBNelVWEOl2OWE7VwRH7rTAs6FE/BDYLliTp9r0m8+lBAgU9M84j4OITXGA FoxQQtTCJET5O1e7K9/RhelK/T5bKeIC+X8HeJXPwtLilKACSObpFTiuMgg5VmS9bBE5 CTkICjwFhx5fvqEgJOIg7yM8g3NQRKkCGeyoITLZWD9Q0XJ60cQNN0wdMoKRkIwGreXv /Pft9CnQ6XZIwvtEvUTCvePcW9ElPvw3pUvGb6zQuptVU92hprhRXZXJoPiEBJ2WvOcL C73A== X-Gm-Message-State: AOJu0YxzXjxu46ORNzFsk0EdiSiyS28oKVMlpIsfVsCbxF9ZxWjVYQGz Rds84QzI4poA2WG5uYBwO19E41f6dJ0s4Brq6/9DOwrnlw/ZcYBOc5nc4vzH X-Gm-Gg: ASbGncszhZSFKCygbi3lkz43Ar179zFHIQleflu3j985eV6IuY5xKa9XYIvoM+QhcIt XmMh/8PMU/8B9r+n8As79Kl71TZYrTi5sCZMDZ/DQAwS4mIlkN8iVd8VOi9ft3s7BRad8Qj+TQ5 40tvdYsb1Mvj6B1jxVMLEHwvK2jgg3lnkqRSVA36NZaMhBLVB175KAzJtfVk7tJwtsp23o6Gaun mBIgnTtq3a+KWb8nLqtFTbsBKw1EwLPzCKenc3uOmrLxTPWK/+WL9ny/Ta1pw7MUsGBdNATPkyB C7g3sYkR16ouSQKrZvmoqCgTiIoE4zVOf64FPEftI1kEauPgFiDc6ZiWvK8VF7HG0u8IFhIeBYf F2J+OB2FFpvkLMPt3Btm9 X-Google-Smtp-Source: AGHT+IHH+Iv+fJO9G9COspyZ1KCR/WRkLQpfFOBj+R9iBnAfUc7miUNL6XvXUVT5Iz3hDaC01Rp8rg== X-Received: by 2002:a17:902:ecc3:b0:220:cd9a:a167 with SMTP id d9443c01a7336-22780c511c3mr207728315ad.4.1742804386787; Mon, 24 Mar 2025 01:19: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 4/6] ui/egl: support multi-plane dmabuf when egl export/import Date: Mon, 24 Mar 2025 16:19:19 +0800 Message-ID: <20250324081922.359369-5-yuq825@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324081922.359369-1-yuq825@gmail.com> References: <20250324081922.359369-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::635; envelope-from=yuq825@gmail.com; helo=mail-pl1-x635.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: 1742804438220116600 Content-Type: text/plain; charset="utf-8" From: Qiang Yu Signed-off-by: Qiang Yu --- include/ui/egl-helpers.h | 5 ++- ui/dbus-listener.c | 19 +++++---- ui/egl-helpers.c | 86 +++++++++++++++++++++++++++++----------- ui/spice-display.c | 58 ++++++++++++++++++--------- 4 files changed, 116 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 3b39a23846..73b72ed57c 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 970286325f..864855f540 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -283,39 +283,75 @@ 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); + const int *fd =3D qemu_dmabuf_get_fd(dmabuf); + const uint32_t *offset =3D qemu_dmabuf_get_offset(dmabuf); + const uint32_t *stride =3D qemu_dmabuf_get_stride(dmabuf); + 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; @@ -328,18 +364,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_fd(dmabuf)[0]; - attrs[i++] =3D EGL_DMA_BUF_PLANE0_PITCH_EXT; - attrs[i++] =3D qemu_dmabuf_get_stride(dmabuf)[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 fd[j] >=3D 0 ? fd[j] : fd[0]; + attrs[i++] =3D stride_attrs[j]; + attrs[i++] =3D stride[j]; + attrs[i++] =3D offset_attrs[j]; + attrs[i++] =3D offset[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 82598fe9e8..b7016ece6a 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_stride(dmabuf)[0]; --=20 2.43.0 From nobody Tue Apr 1 07:40:29 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=1742804474; cv=none; d=zohomail.com; s=zohoarc; b=DvEjSfylBFyR3O8Klfrlb8HN+SDpP+3veFeXyF8PnkA9Nb/Vf8kHULIl79wWx/ZIXlX4pOXsz0JpwwwaiEBcdZmB9FoJG1cH36575kdsMxcxREuokFlNTMEKWdjajitBdKsxjYxhvZwwtprocuF0n1imkM3jEtaGkFZng699ZnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742804474; 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=MOpnM5k0/7RKu+1euKv2KpHJgg77Uj6rRlq9oExCvSk=; b=fAsbyvp98T78W4XWdEFlsvP3mCbVCGi0PiE6wrqV9Q7PZfGMXJhieogGDwM95IMnM+68i6LYM9e+WyipMVu3H3AtR096YWE/+LTIBtME2rWBM5t3P+GNYwZfHMf3HJcO7nyRgBb4zfyjFWHtNiYCl270dnGhkLqMiIqcu5p+oaY= 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 1742804474743800.7517121688963; Mon, 24 Mar 2025 01:21:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twd38-0006iR-Ol; Mon, 24 Mar 2025 04:20:46 -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 1twd2I-0005y9-70 for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:54 -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 1twd2G-0008VV-0m for qemu-devel@nongnu.org; Mon, 24 Mar 2025 04:19:53 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2240b4de12bso59687295ad.2 for ; Mon, 24 Mar 2025 01:19:51 -0700 (PDT) Received: from localhost.localdomain (awork062150.netvigator.com. [203.198.28.150]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm64717685ad.252.2025.03.24.01.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 01:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742804390; x=1743409190; 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=MOpnM5k0/7RKu+1euKv2KpHJgg77Uj6rRlq9oExCvSk=; b=ID2qSPLsTIJiqFrkpqZICKpglHu8p3z/ZTCq32xNudWjmDzINHQlRLAvm4lcalXzAD PB1mA2imc8XQP+vFG7qXMCFoGfzSpJRwrjtlAVuqLsF6gZS2xq9oftA2VJ3u/V8NNwC/ 1g4IEbNBpJRwm/hfz0y3nhJhnIJC9A2I4rxLfuCOBUT8BuTxbqlK7m78NwQrG/82H+t4 Tpm0neVrPkND73EJRBgliExgn4nOMYM9i6NjEUpQCaf+ll0BX8qq5U41vCPN6JPyVE+J CniBwUrZyM4nW1xOm6MqxCeeiU2oZaJ6t9XVN9GCy8MGQwKs8GVDbM41hElDJy8BwTbH Bz3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742804390; x=1743409190; 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=MOpnM5k0/7RKu+1euKv2KpHJgg77Uj6rRlq9oExCvSk=; b=vEhG8lGhCctdebdsXYauZehTDTYw8JanvlcGBNLouLTFDAhxXTXrLyheXF71Dsus8p q75DqjHaWwgapbLmlq7cAWq6YBqPAZPB38qrn2TK99hD4WAlbpimjhf7lffzMBLMsMxT 3qlYOgMkllf5F5ufIA+WWnyGP2l5gMoIFh6dO89obv9/cWZvKlAUBnKwz8Fb4wZ/BWyk frgg5VO8fd/JyJ2E2j9mHBtNUmWQdw9DhCpU5jIjvILiFCbGjMXFmUk0kdBnbPQQA8bV IjeLEPCcj/LXoQ1AL+wh7abMNPfnKpS5MumNdGcU1ylzvt8mTm51Xe/MbPKSsx9YTCVM 9DdQ== X-Gm-Message-State: AOJu0YwVq3HLwAaompgSMS+F6/sQKOsTXBCoFbhEJCSHl3Vt2eVWItd+ u8L/rCE8/RRI9OYGCezKVZAt31kY8aixdAIs5aYu3n2gQFPT8d3Else91s8j X-Gm-Gg: ASbGncuhwjw4bp7cw03Ggp/h41MiVje5mLAQxh9p8vPldDotBo3BKFXY5mh5zcPYBqj jvRD2idSjsQlyIH1/gnsOkpvGBYXHHKx2AYfFG6UZobN/5m125jU3CD/XrFPeI5Ea3MzZ8ajXiz IIBoaWou1e/PWsUiRFGSAq5256vs1EnJ3tn6SNCNQuYpmq7ITFDxgapjKn+SEGAHYIZKg89w0bc X8AicNIYvgYRMbSV3qwPSndxDAgyLedWNdT5wJIiFSD7SzZ+dUOG8AZS5bIlhb3wVfZpTi2VKJD pkSHrrfpj2WQhM0FgA2G5P6m9/2eLOJXj5DXw6wur8Inh3qMrFx9J+/9PreS6lE9EuNyn8E0T68 7Ff5u7WCqks5U5MnLeLtI X-Google-Smtp-Source: AGHT+IFAOYVKiRCSAoict2NQHbVLkuMtR247KxvPmXreRLR6Uw8hg3w8GuB1Ozsj9GtgYH3nlGgKhg== X-Received: by 2002:a17:902:e54a:b0:21f:85ee:f2df with SMTP id d9443c01a7336-22780c79888mr177158315ad.15.1742804389683; Mon, 24 Mar 2025 01:19:49 -0700 (PDT) From: yuq825@gmail.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiang Yu Subject: [PATCH 5/6] ui/dbus: change dbus ScanoutDMABUF interface Date: Mon, 24 Mar 2025 16:19:20 +0800 Message-ID: <20250324081922.359369-6-yuq825@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324081922.359369-1-yuq825@gmail.com> References: <20250324081922.359369-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::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: 1742804476465116600 Content-Type: text/plain; charset="utf-8" From: Qiang Yu To handle multi plane. Signed-off-by: Qiang Yu --- ui/dbus-display1.xml | 37 ++++++++++++++++ ui/dbus-listener.c | 103 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 133 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 + + + + + + + + + + + + + + + + + +