From nobody Sun Nov 16 00:58:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1745907186; cv=none; d=zohomail.com; s=zohoarc; b=WwG80NAYjUP84ttQQF6pVaytYYPhrWoq0K9QyP7gw3vbCGZthlvqCZYfyYGxm3vu4oiVhAWZVLCc02NB1djmnjPKPJ5pLcBhfA0k6sWCAcRy93Fp44Doe4cGrYqoJb9LF0HqNynbpaWUpecWRtaIgtoqnczjeofGxIe23vZfayY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745907186; 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=u8z6LW3Y0GrT/OBg5u+YC2/IFL9sviYVQFTjwFPAvJ0=; b=ONT4tSrYPeUdliTXmbqcVtgpZmGwrtMJqFGn1SuRXzOEb9Xf7yMjWnw4XBAvqWS9rjetNwO9e4KsNjiAINKno02Ore5MWNWFAM45Yx562KuOhk5zu7/Oh1mivZsuNTNCDleZOFTqakhaYQmOjqlqiM1h2lzbVDmt6tIpRTL4NEo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174590718641451.50601788660322; Mon, 28 Apr 2025 23:13:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9eCw-0000qp-5H; Tue, 29 Apr 2025 02:12:42 -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 1u9eCg-0000b0-6W for qemu-devel@nongnu.org; Tue, 29 Apr 2025 02:12:29 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9eCe-0005MH-5i for qemu-devel@nongnu.org; Tue, 29 Apr 2025 02:12:25 -0400 Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 23:12:10 -0700 Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 23:12:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745907144; x=1777443144; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xyJgixVGy2/ZdOJLBT4m37r+RUqgTU2ICmfmg8ws5K0=; b=Kt+6cTnmYYxH++s92IUvRiaGeD8tPAArVyYfHB1lvINxXbXKOmxaxchW w6YTutzQjllZKGV4wp1/qc4xIOkuq4cFiz0MVn1kwfT3vW39k2Bb4Yqzn 0p5ttjkdkpDsom2gs7gpNgOvV016fGkIGdeLyVvvvVOZIJr+d0lZekUvf Cbrw/3Rt97QRDlnnbDmtB8gjnrnxiC3NbaHszDnUC1aOk+cSoLajDifXC eyGdYe5kY9WPf4vgs/gWctAdkx9yZS+/ycs8iWl84SmZGysAa5HqnIAUH 043k5vB9E2EyC3wSTpDMKdhtBD0C9zQ3Xzp8EDuw5u0omORQMIUAwOGSD A==; X-CSE-ConnectionGUID: IpRxhNEaTMqOeWltaoHtbQ== X-CSE-MsgGUID: LPrOFuCYRT+TgNoBPVv/dw== X-IronPort-AV: E=McAfee;i="6700,10204,11417"; a="58169837" X-IronPort-AV: E=Sophos;i="6.15,248,1739865600"; d="scan'208";a="58169837" X-CSE-ConnectionGUID: TVoL0VuQRhGrzkizw1nGyw== X-CSE-MsgGUID: hXisuGyoT02ejkAYOUibfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,248,1739865600"; d="scan'208";a="133687176" From: Vivek Kasireddy To: qemu-devel@nongnu.org Cc: Vivek Kasireddy , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Dmitry Osipenko , Frediano Ziglio , Dongwon Kim Subject: [PATCH v3 6/6] ui/spice: Blit the scanout texture if its memory layout is not linear Date: Mon, 28 Apr 2025 23:08:30 -0700 Message-ID: <20250429060952.59508-7-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429060952.59508-1-vivek.kasireddy@intel.com> References: <20250429060952.59508-1-vivek.kasireddy@intel.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=192.198.163.9; envelope-from=vivek.kasireddy@intel.com; helo=mgamail.intel.com X-Spam_score_int: -48 X-Spam_score: -4.9 X-Spam_bar: ---- X-Spam_report: (-4.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.484, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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 @intel.com) X-ZM-MESSAGEID: 1745907188226019000 In cases where the scanout buffer is provided as a texture (e.g. Virgl) we need to check to see if it has a linear memory layout or not. If it doesn't have a linear layout, then blitting it onto the texture associated with the display surface (which already has a linear layout) seems to ensure that there is no corruption seen regardless of which encoder or decoder is used. Cc: Gerd Hoffmann Cc: Marc-Andr=C3=A9 Lureau Cc: Dmitry Osipenko Cc: Frediano Ziglio Cc: Dongwon Kim Signed-off-by: Vivek Kasireddy --- include/ui/spice-display.h | 3 ++ ui/spice-display.c | 67 +++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index f4922dd74b..d087d7198a 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -132,6 +132,9 @@ struct SimpleSpiceDisplay { egl_fb guest_fb; egl_fb blit_fb; egl_fb cursor_fb; + bool backing_y_0_top; + bool blit_scanout_texture; + bool new_scanout_texture; bool have_hot; #endif }; diff --git a/ui/spice-display.c b/ui/spice-display.c index 047d453a0b..3fa15d6981 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -1035,20 +1035,34 @@ static void qemu_spice_gl_scanout_texture(DisplayCh= angeListener *dcl, { SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); EGLint stride =3D 0, fourcc =3D 0; + EGLuint64KHR modifier =3D 0; int fd =3D -1; =20 assert(tex_id); - fd =3D egl_get_fd_for_texture(tex_id, &stride, &fourcc, NULL); + + fd =3D egl_get_fd_for_texture(tex_id, &stride, &fourcc, &modifier); if (fd < 0) { fprintf(stderr, "%s: failed to get fd for texture\n", __func__); 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); - qemu_spice_gl_monitor_config(ssd, x, y, w, h); + if (remote_client && modifier !=3D DRM_FORMAT_MOD_LINEAR) { + egl_fb_destroy(&ssd->guest_fb); + egl_fb_setup_for_tex(&ssd->guest_fb, + backing_width, backing_height, + tex_id, false); + ssd->backing_y_0_top =3D y_0_top; + ssd->blit_scanout_texture =3D true; + ssd->new_scanout_texture =3D true; + close(fd); + } else { + /* note: spice server will close the fd */ + spice_qxl_gl_scanout(&ssd->qxl, fd, backing_width, backing_height, + stride, fourcc, y_0_top); + qemu_spice_gl_monitor_config(ssd, x, y, w, h); + } + ssd->have_surface =3D false; ssd->have_scanout =3D true; } @@ -1114,6 +1128,41 @@ static void qemu_spice_gl_release_dmabuf(DisplayChan= geListener *dcl, egl_dmabuf_release_texture(dmabuf); } =20 +static bool spice_gl_blit_scanout_texture(SimpleSpiceDisplay *ssd) +{ + EGLint stride =3D 0, fourcc =3D 0; + int fd; + + egl_fb_destroy(&ssd->blit_fb); + egl_fb_setup_for_tex(&ssd->blit_fb, + surface_width(ssd->ds), surface_height(ssd->ds), + ssd->ds->texture, false); + egl_fb_blit(&ssd->blit_fb, &ssd->guest_fb, false); + glFlush(); + + if (!ssd->new_scanout_texture) { + return true; + } + + fd =3D egl_get_fd_for_texture(ssd->ds->texture, + &stride, &fourcc, + NULL); + if (fd < 0) { + fprintf(stderr, "%s: failed to get fd for texture\n", __func__); + return false; + } + + spice_qxl_gl_scanout(&ssd->qxl, fd, + surface_width(ssd->ds), + surface_height(ssd->ds), + stride, fourcc, ssd->backing_y_0_top); + qemu_spice_gl_monitor_config(ssd, 0, 0, + surface_width(ssd->ds), + surface_height(ssd->ds)); + ssd->new_scanout_texture =3D false; + return true; +} + static void qemu_spice_gl_update(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint3= 2_t h) { @@ -1121,6 +1170,7 @@ static void qemu_spice_gl_update(DisplayChangeListene= r *dcl, EGLint stride =3D 0, fourcc =3D 0; bool render_cursor =3D false; bool y_0_top =3D false; /* FIXME */ + bool ret; int fd; uint32_t width, height, texture; =20 @@ -1195,6 +1245,13 @@ static void qemu_spice_gl_update(DisplayChangeListen= er *dcl, glFlush(); } =20 + if (remote_client && ssd->blit_scanout_texture) { + ret =3D spice_gl_blit_scanout_texture(ssd); + if (!ret) { + return; + } + } + trace_qemu_spice_gl_update(ssd->qxl.id, w, h, x, y); qemu_spice_gl_block(ssd, true); glFlush(); --=20 2.49.0