From nobody Fri May 10 17:05:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1694428304; cv=pass; d=zohomail.com; s=zohoarc; b=SfyVICglQsQHEVyX90P8QF3w/sLTKC9/fUDK82WJ7oR5U6kG+xkMUFO3cZv3A0mKWlh50Xxyj6PAO+nrGATmuM13SOXMPvI+peFACz0pD5F2g7nn9U3+CDqNZbppQUd9Fs8ofGJYsM+8Z6LpxGa18RnKWDtYId85QQWnWtvkrRo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694428304; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=be0+IeLWy2MesQFcUruoJ0FC8oaHcxOl/YQhM8BdXiM=; b=h6HG4rgxoME1WsaL53G0QwQK9g8PiC0fzCmLn+W9q5C2kK4p+t0DrW1Qq06jwJZOElpy5VeQnIpJdRO3eeS5h2rAXFUbN6TNRnwtsqKx/CJp/IXHG55Jy65ifPcC6V9eCWj4IDPeLFGLJprn0jQpHP4378lw49gN2+VDbkhFFAg= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1694428303987172.77835547461075; Mon, 11 Sep 2023 03:31:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfeCE-0005iA-J9; Mon, 11 Sep 2023 06:31:10 -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 1qfeCC-0005X2-Br for qemu-devel@nongnu.org; Mon, 11 Sep 2023 06:31:08 -0400 Received: from mail-mw2nam10on20605.outbound.protection.outlook.com ([2a01:111:f400:7e89::605] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfeC9-0004vC-AC for qemu-devel@nongnu.org; Mon, 11 Sep 2023 06:31:08 -0400 Received: from CH0PR03CA0052.namprd03.prod.outlook.com (2603:10b6:610:b3::27) by DS0PR12MB6415.namprd12.prod.outlook.com (2603:10b6:8:cc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Mon, 11 Sep 2023 10:31:01 +0000 Received: from DS3PEPF000099D5.namprd04.prod.outlook.com (2603:10b6:610:b3:cafe::99) by CH0PR03CA0052.outlook.office365.com (2603:10b6:610:b3::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35 via Frontend Transport; Mon, 11 Sep 2023 10:31:00 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099D5.mail.protection.outlook.com (10.167.17.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6792.16 via Frontend Transport; Mon, 11 Sep 2023 10:31:00 +0000 Received: from cjq-desktop.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 11 Sep 2023 05:30:55 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EWSybtUMKyXGdbcxifNy7Pe16cA2pb2s+JZ9sf4gkibzAXZ+lEuKfl0/cKh2J1FoakrI9RSY8S3fSc2DNX4buiQQJBpK0zY+bo1B/j0sci4ge59/qAMRLoKpMn6y4SUPi89flM6u9xjTWhO9o8FP5SzgdAY1dhV5tFGDanypiHyiLbXTMVZc6L8ANPI6ywvGWJRQeSxzW3oWHOHPOkVQG4/a+9y3MvFQoH95BiXRPo46RwWG44aUnh+Pe+FzdwHQiUsBLlLP53upqGPJpGUjdz0WQ0hnyK8bUAQIAqc5Nx/R2FjNjrvmgAPFWdd8VqJlAM3w/F/c3KtkrFTMGdr4sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=be0+IeLWy2MesQFcUruoJ0FC8oaHcxOl/YQhM8BdXiM=; b=IdqahC3KpMK7KHjNg3ZAXIUyMh4jtlq05x7sxq+Y+KCJvYwZlRUb7ib8EeWjC7ctJKYQArbc/WRYuNAQIYJZ1PaA5m0QZQsbou8bgWY3t69PQIO3sTY+zBIXdJe0uZ+UpKD0rXnQcISHLd3uhaM8KF6twtYCp1K+Qiru/4jiDG6/iAOEHI9mns/tztZOZqg/7rv56SiBAJi3E/XozCQs77iktLg8q5W3IlqMCwWH/yebeQbgoBTrunqZ+6D1r+yTpNdYxbQUH48c9xgVYdrPzRSo77YKO++NMb5CbS4FXCS0SLzoB1xea9yqXpWYGsk/F18yO15LajKPfwbPoy1WyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=be0+IeLWy2MesQFcUruoJ0FC8oaHcxOl/YQhM8BdXiM=; b=PVqZ7lSPJlTSXlKA099bLWag0bOMO0+IoKwJVbKgwEIMB9/GunbrnASX9dg6hU/vzz7SjLC0N32wrUFBomTLhGj+wiOjGFo+ih1eagvbHENviFYAcnEiWGqNUsj1xtR6D1FyP8U0wrbH+YBAg0GOmxr35Oe5/mHA+06x2FkfD3U= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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 (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Jiqian Chen To: Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S . Tsirkin" , "Robert Beckett" , CC: , Stefano Stabellini , Anthony PERARD , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , "Dr . David Alan Gilbert" , Alex Deucher , Christian Koenig , Stewart Hildebrand , Xenia Ragiadakou , Honglei Huang , Julia Zhang , Huang Rui , Jiqian Chen Subject: [RESEND QEMU PATCH v4 1/1] virtgpu: do not destroy resources when guest suspend Date: Mon, 11 Sep 2023 18:30:31 +0800 Message-ID: <20230911103031.1432693-2-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230911103031.1432693-1-Jiqian.Chen@amd.com> References: <20230911103031.1432693-1-Jiqian.Chen@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D5:EE_|DS0PR12MB6415:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c9f0a2c-59a8-44b2-2e26-08dbb2b23190 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hdmFuSZB3cNsypMQ2wyOblGOLlxf2F1KMtoaL/tRZgUYNxSFj44oLTrWFEWqxSMbur40D8Wyi13W974kc6j2cKSLrIx01uMvoLvdx0ZqJtLxlPHKUjPi789zOU2mUlItct8PSfKtk/vobrHUPeGaOj6E2WxV1ar9fpONWG1SGsiz0BZ3lNB92ag/lS5qndPjjoP1/DRXauiB0bPCcZ04ZtHYT4X9ysnwi5mKK4VE2pOT6LJBEakM9UnFHmlxGR9dye2LGNqHyhPHDSuTtjIAILzndGA3jgFhigtlG9FKCEJ7M0Klqgp6ya2C854rtDZp4hCiw3cDd8jVxmsboRpkf/oPtmuj5KEzEmCgTJw+6tcB4jmREM4bOzhrQ2XFA2S4+ClZWy32B+AMRCtOHGhC8CgJD40GPDZu2Rr6eI13NIduYF2pNyGXmEaG5S/c4vy69bwIk1t7q9yW7D/gUaPQmEWlMK5oGn5MomA4CTHplgAI1RPYlOC4c9AFs52wUWDrqSHFXztXprJG30BZcM9tx2FNqHC3c5ROm31rVWCi1pvyiAnaBooEGjjDz4LbBcMInIGke04/rIeqcrRyro4u+et0pOyBG1Cof6ZU4CZBZuUX2dieUrdXjiJX6lzLDc+3+noyaL3n+VlQ5DGWozAqr96qENDaDO2x/kf3ZREe/F7NZm/FqduMu15aXlEDE1oeE79USBv4927mwtlD44YtS8R0Y3/DNbqfgvUqYAsmTW9C6pW3fK2AmKW6JDNh6mCPdCAixz3z8pzEXeLU9FiZDw== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(376002)(136003)(396003)(346002)(186009)(451199024)(1800799009)(82310400011)(36840700001)(46966006)(40470700004)(41300700001)(316002)(7416002)(15650500001)(1076003)(16526019)(40480700001)(26005)(336012)(426003)(2906002)(110136005)(8936002)(8676002)(70206006)(4326008)(54906003)(70586007)(5660300002)(478600001)(6666004)(40460700003)(7696005)(36756003)(36860700001)(47076005)(2616005)(83380400001)(81166007)(86362001)(82740400003)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 10:31:00.3200 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c9f0a2c-59a8-44b2-2e26-08dbb2b23190 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099D5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6415 Received-SPF: softfail client-ip=2a01:111:f400:7e89::605; envelope-from=Jiqian.Chen@amd.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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 @amd.com) X-ZM-MESSAGEID: 1694428304672100003 Content-Type: text/plain; charset="utf-8" After suspending and resuming guest VM, you will get a black screen, and the display can't come back. This is because when guest did suspending, it called into qemu to call virtio_gpu_gl_reset. In function virtio_gpu_gl_reset, it destroyed resources and reset renderer, which were used for display. As a result, guest's screen can't come back to the time when it was suspended and only showed black. So, this patch adds a new ctrl message VIRTIO_GPU_CMD_SET_FREEZE_MODE to get notifications from guest. If guest is during suspending, it sets freeze mode of virtgpu to freeze_S3, this will prevent destroying resources and resetting renderer when guest calls into virtio_gpu_gl_reset. If guest is during resuming, it sets freeze mode to unfreeze, and then virtio_gpu_gl_reset will keep its origin actions and has no other impaction. Due to this implemention needs cooperation with guest, so it added a new feature flag VIRTIO_GPU_F_FREEZE_S3, so that guest and host can negotiate whenever freeze_S3 is supported or not. Signed-off-by: Jiqian Chen --- hw/display/virtio-gpu-base.c | 3 +++ hw/display/virtio-gpu-gl.c | 10 ++++++- hw/display/virtio-gpu-virgl.c | 7 +++++ hw/display/virtio-gpu.c | 48 ++++++++++++++++++++++++++++++++-- hw/virtio/virtio-qmp.c | 3 +++ include/hw/virtio/virtio-gpu.h | 6 +++++ 6 files changed, 74 insertions(+), 3 deletions(-) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index ca1fb7b16f..ccc7cc80ce 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -232,6 +232,9 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64= _t features, if (virtio_gpu_blob_enabled(g->conf)) { features |=3D (1 << VIRTIO_GPU_F_RESOURCE_BLOB); } + if (virtio_gpu_freeze_S3_enabled(g->conf)) { + features |=3D (1 << VIRTIO_GPU_F_FREEZE_S3); + } =20 return features; } diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index e06be60dfb..cb418dae9a 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -100,7 +100,15 @@ static void virtio_gpu_gl_reset(VirtIODevice *vdev) */ if (gl->renderer_inited && !gl->renderer_reset) { virtio_gpu_virgl_reset_scanout(g); - gl->renderer_reset =3D true; + /* + * If guest is suspending, we shouldn't reset renderer, + * otherwise, the display can't come back to the time when + * it was suspended after guest was resumed. + */ + if (!virtio_gpu_freeze_S3_enabled(g->parent_obj.conf) || + g->freeze_mode =3D=3D VIRTIO_GPU_FREEZE_MODE_UNFREEZE) { + gl->renderer_reset =3D true; + } } } =20 diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 8bb7a2c21f..ba4258487e 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -483,6 +483,13 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, case VIRTIO_GPU_CMD_GET_EDID: virtio_gpu_get_edid(g, cmd); break; + case VIRTIO_GPU_CMD_SET_FREEZE_MODE: + if (virtio_gpu_freeze_S3_enabled(g->parent_obj.conf)) { + virtio_gpu_cmd_set_freeze_mode(g, cmd); + } else { + cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + } + break; default: cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; break; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index bbd5c6561a..0cfccde834 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -383,6 +383,16 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU = *g, QTAILQ_INSERT_HEAD(&g->reslist, res, next); } =20 +void virtio_gpu_cmd_set_freeze_mode(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + struct virtio_gpu_set_freeze_mode sf; + + VIRTIO_GPU_FILL_CMD(sf); + virtio_gpu_bswap_32(&sf, sizeof(sf)); + g->freeze_mode =3D sf.freeze_mode; +} + static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id) { struct virtio_gpu_scanout *scanout =3D &g->parent_obj.scanout[scanout_= id]; @@ -1018,6 +1028,13 @@ void virtio_gpu_simple_process_cmd(VirtIOGPU *g, case VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING: virtio_gpu_resource_detach_backing(g, cmd); break; + case VIRTIO_GPU_CMD_SET_FREEZE_MODE: + if (virtio_gpu_freeze_S3_enabled(g->parent_obj.conf)) { + virtio_gpu_cmd_set_freeze_mode(g, cmd); + } else { + cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + } + break; default: cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; break; @@ -1394,11 +1411,28 @@ void virtio_gpu_device_realize(DeviceState *qdev, E= rror **errp) QTAILQ_INIT(&g->reslist); QTAILQ_INIT(&g->cmdq); QTAILQ_INIT(&g->fenceq); + + g->freeze_mode =3D VIRTIO_GPU_FREEZE_MODE_UNFREEZE; } =20 static void virtio_gpu_device_unrealize(DeviceState *qdev) { VirtIOGPU *g =3D VIRTIO_GPU(qdev); + struct virtio_gpu_simple_resource *res, *tmp; + + /* + * This is to prevent memory leak in the situation that qemu is + * destroyed when guest is suspended. This also need hot-plug + * support. + */ + if (virtio_gpu_freeze_S3_enabled(g->parent_obj.conf) && + g->freeze_mode =3D=3D VIRTIO_GPU_FREEZE_MODE_FREEZE_S3) { + QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { + virtio_gpu_resource_destroy(g, res); + } + virtio_gpu_virgl_reset(g); + g->freeze_mode =3D VIRTIO_GPU_FREEZE_MODE_UNFREEZE; + } =20 g_clear_pointer(&g->ctrl_bh, qemu_bh_delete); g_clear_pointer(&g->cursor_bh, qemu_bh_delete); @@ -1413,8 +1447,16 @@ static void virtio_gpu_reset_bh(void *opaque) struct virtio_gpu_simple_resource *res, *tmp; int i =3D 0; =20 - QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { - virtio_gpu_resource_destroy(g, res); + /* + * If guest is suspending, we shouldn't destroy resources, + * otherwise, the display can't come back to the time when + * it was suspended after guest was resumed. + */ + if (!virtio_gpu_freeze_S3_enabled(g->parent_obj.conf) || + g->freeze_mode =3D=3D VIRTIO_GPU_FREEZE_MODE_UNFREEZE) { + QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { + virtio_gpu_resource_destroy(g, res); + } } =20 for (i =3D 0; i < g->parent_obj.conf.max_outputs; i++) { @@ -1509,6 +1551,8 @@ static Property virtio_gpu_properties[] =3D { 256 * MiB), DEFINE_PROP_BIT("blob", VirtIOGPU, parent_obj.conf.flags, VIRTIO_GPU_FLAG_BLOB_ENABLED, false), + DEFINE_PROP_BIT("freeze_S3", VirtIOGPU, parent_obj.conf.flags, + VIRTIO_GPU_FLAG_FREEZE_S3_ENABLED, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index 7515b0947b..a5a6ccc515 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -227,6 +227,9 @@ static const qmp_virtio_feature_map_t virtio_gpu_featur= e_map[] =3D { FEATURE_ENTRY(VIRTIO_GPU_F_CONTEXT_INIT, \ "VIRTIO_GPU_F_CONTEXT_INIT: Context types and synchronization " "timelines supported"), + FEATURE_ENTRY(VIRTIO_GPU_F_FREEZE_S3, \ + "VIRTIO_GPU_F_FREEZE_S3: Freezing virtio-gpu and keeping resou= rces" + "alive is supported."), FEATURE_ENTRY(VHOST_F_LOG_ALL, \ "VHOST_F_LOG_ALL: Logging write descriptors supported"), FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \ diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 390c4642b8..1ea87227ff 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -93,6 +93,7 @@ enum virtio_gpu_base_conf_flags { VIRTIO_GPU_FLAG_EDID_ENABLED, VIRTIO_GPU_FLAG_DMABUF_ENABLED, VIRTIO_GPU_FLAG_BLOB_ENABLED, + VIRTIO_GPU_FLAG_FREEZE_S3_ENABLED, }; =20 #define virtio_gpu_virgl_enabled(_cfg) \ @@ -105,6 +106,8 @@ enum virtio_gpu_base_conf_flags { (_cfg.flags & (1 << VIRTIO_GPU_FLAG_DMABUF_ENABLED)) #define virtio_gpu_blob_enabled(_cfg) \ (_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED)) +#define virtio_gpu_freeze_S3_enabled(_cfg) \ + (_cfg.flags & (1 << VIRTIO_GPU_FLAG_FREEZE_S3_ENABLED)) =20 struct virtio_gpu_base_conf { uint32_t max_outputs; @@ -179,6 +182,7 @@ struct VirtIOGPU { =20 uint64_t hostmem; =20 + virtio_gpu_freeze_mode_t freeze_mode; bool processing_cmdq; QEMUTimer *fence_poll; QEMUTimer *print_stats; @@ -293,5 +297,7 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g); void virtio_gpu_virgl_reset(VirtIOGPU *g); int virtio_gpu_virgl_init(VirtIOGPU *g); int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g); +void virtio_gpu_cmd_set_freeze_mode(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd); =20 #endif --=20 2.34.1