From patchwork Tue May 11 08:08:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 12250253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96B52C433ED for ; Tue, 11 May 2021 08:54:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04BD46109F for ; Tue, 11 May 2021 08:54:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04BD46109F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgOA8-00065p-2v for qemu-devel@archiver.kernel.org; Tue, 11 May 2021 04:54:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgNe8-0000HT-Se for qemu-devel@nongnu.org; Tue, 11 May 2021 04:21:40 -0400 Received: from mga17.intel.com ([192.55.52.151]:32226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgNe5-0004x4-3O for qemu-devel@nongnu.org; Tue, 11 May 2021 04:21:40 -0400 IronPort-SDR: W5/uZQ/U0zApG3u+S71Bzo427f0WP9KvMTF285YEYE7lKi+FsAYrw28nCyX/FZQttfaNgyvwCK 8Z9X8RLJaMAQ== X-IronPort-AV: E=McAfee;i="6200,9189,9980"; a="179649397" X-IronPort-AV: E=Sophos;i="5.82,290,1613462400"; d="scan'208";a="179649397" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2021 01:20:49 -0700 IronPort-SDR: YF2i2PBW8U/INCtP9KjeT8gNVblw0pL8Syks74MXoyzOr8CEHOfYGseuC+zeIqmMTXZD0vEZGa MaAbM2J1+J9g== X-IronPort-AV: E=Sophos;i="5.82,290,1613462400"; d="scan'208";a="536892221" Received: from vkasired-desk2.fm.intel.com ([10.105.128.127]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2021 01:20:49 -0700 From: Vivek Kasireddy To: qemu-devel@nongnu.org Subject: [PATCH v3 16/20] virtio-gpu: Add virtio_gpu_wait_flush API Date: Tue, 11 May 2021 01:08:14 -0700 Message-Id: <20210511080818.366985-17-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210511080818.366985-1-vivek.kasireddy@intel.com> References: <20210511080818.366985-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.151; envelope-from=vivek.kasireddy@intel.com; helo=mga17.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vivek Kasireddy , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This new command can be used by the Guest Compositor as a way to synchronize its updates (repaint/redraw) with Host UI buffer submissions (redraw). In other words, the Guest can wait until the buffer it has submitted has been used by the Host before it starts it new repaint cycle. Cc: Gerd Hoffmann Signed-off-by: Vivek Kasireddy --- hw/display/virtio-gpu.c | 31 +++++++++++++++++++++ include/standard-headers/linux/virtio_gpu.h | 10 +++++++ 2 files changed, 41 insertions(+) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 694d8f550c..59cbc2b1df 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -933,6 +933,30 @@ virtio_gpu_resource_detach_backing(VirtIOGPU *g, virtio_gpu_cleanup_mapping(g, res); } +static void virtio_gpu_wait_flush(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_wait_flush wf; + + VIRTIO_GPU_FILL_CMD(wf); + virtio_gpu_bswap_32(&wf, sizeof(wf)); + + res = virtio_gpu_find_check_resource(g, wf.resource_id, true, + __func__, &cmd->error); + if (!res) { + return; + } + + if (res->blob) { + if (cmd->cmd_hdr.flags & VIRTIO_GPU_FLAG_FENCE && + virtio_gpu_resource_has_sync(g, res)) { + virtio_gpu_resource_wait_sync(g, res); + cmd->finished = true; + } + } +} + void virtio_gpu_simple_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) { @@ -981,6 +1005,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_WAIT_FLUSH: + if (!virtio_gpu_expflush_enabled(g->parent_obj.conf)) { + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + break; + } + virtio_gpu_wait_flush(g, cmd); + break; default: cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; break; diff --git a/include/standard-headers/linux/virtio_gpu.h b/include/standard-headers/linux/virtio_gpu.h index d015741f0b..f9aba84174 100644 --- a/include/standard-headers/linux/virtio_gpu.h +++ b/include/standard-headers/linux/virtio_gpu.h @@ -60,6 +60,9 @@ */ #define VIRTIO_GPU_F_RESOURCE_BLOB 3 +/* + * VIRTIO_GPU_CMD_WAIT_FLUSH + */ #define VIRTIO_GPU_F_EXPLICIT_FLUSH 4 enum virtio_gpu_ctrl_type { @@ -80,6 +83,7 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID, VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB, VIRTIO_GPU_CMD_SET_SCANOUT_BLOB, + VIRTIO_GPU_CMD_WAIT_FLUSH, /* 3d commands */ VIRTIO_GPU_CMD_CTX_CREATE = 0x0200, @@ -443,4 +447,10 @@ struct virtio_gpu_resource_unmap_blob { uint32_t padding; }; +/* VIRTIO_GPU_CMD_WAIT_FLUSH */ +struct virtio_gpu_wait_flush { + struct virtio_gpu_ctrl_hdr hdr; + uint32_t resource_id; +}; + #endif