From patchwork Fri Jan 15 18:12:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 363667 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp88820jap; Fri, 15 Jan 2021 10:13:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxqioyfFCfkX0kb8qF8kki/jgFVekHBq3qNxkN81N93oopJgXfO9t5nsOsjY4xOOA3uMsTD X-Received: by 2002:a17:90a:430f:: with SMTP id q15mr11822470pjg.218.1610734421855; Fri, 15 Jan 2021 10:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610734421; cv=none; d=google.com; s=arc-20160816; b=bUwRYNMMDHjJyHNH+lR3FFijTrk0JsbmOelWfCzZod4MUWgzdKYDDy4zpDTb7FqoPe XG3VM3OsZF+7wgYd/+GegvUtLwQYHcJTokK3J4U1oerAEkGWGoiJIeUwAyR8pVqaMNE6 PnvaiPFeABAJxr9xz5tipOIY47QPX6RzkpunIv1FA8+Mw8cwNdYh+o1XsVsR0SFOdPbS 0TEp7QwVxt0c4aGp3Gq3Q9f/eb9DKxk8FcS2nEu8iN5fU8JfqbFfa6IyQSa5uEdeEW3f ydnMRdLIKw1Ec8IV91LTp55SaVMMdZsbvYnSU3sJIxo8gz7Xe4KqJ6EnQgnoIPm/pO3s faWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=lTrKgQQxnL2CQbqRxPlRcVZZnHMzZasv4RzA1faeKf0=; b=HZCeOC8hJgIhJ1l42Xe9cGCmRu2m4csEOV1vqWJsoLZT2THxr5qQNjU2zKYhaHhuVm +p7FhZw/z8I/CyzTR/h7xRrG1+b3fOIixJ9/DYE64yb+b3sHc6tEkp4AHbcqy8gk7WfR eCPoj7iSkxzKB5mXn5RfIh1Vdw5XBbBPrEk872vrg4vqrR5BnjJyZP+QNWcuT+xbFxwq PPDNIHl3VhwbNBoRmdmN0IwHtgiGvAhA6UE8oxRkYRf3uOAj7avtnn7yCeLTetG3bFKp wVrbrQ1N50fRBB1spSquy5uD32TyfzSaerDvELIzT37JdqjwLr6oteQk5/AJ1mDzvvQk S4rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HWECHTiz; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id i13si10639988pgf.34.2021.01.15.10.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 10:13:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HWECHTiz; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E48C6E471; Fri, 15 Jan 2021 18:13:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9EF406E0CA for ; Fri, 15 Jan 2021 18:13:21 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id c5so10200366wrp.6 for ; Fri, 15 Jan 2021 10:13:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AAulnEPH2cuzAQ+QE1skPa/vRaGeTOHaeG3APrLY8jg=; b=HWECHTiznfSDEFUnhR6yHMWFXZkOVsFdiCtVUsuRrlYB81kcXzwAYL/dwDStIkFQbq w51jc8DJRNf/zRNcDUz7Qp/4WyP5zAYg/fpQSHyDxtJItXwVBbykBTSEY16yGtHgNYmq WDXERBDxRky0v3qiA1GPoyPOHMfR1EIdghWZQChS8XWjPRnY54Tqjd70ZMF0QQT0+lyD gwvbHGqvPixJKyuEACIczrLieROzmeO0OwuSn7VJh6paOjfC+Zg1qBJLdAv0RqmcDVAn MHGs4liNHWHLfPsxNAGmfOFqwC+/Ymvm4e48P6OFyYlUp7TWoiT1E1dne1FTl4oG1nyM j18g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AAulnEPH2cuzAQ+QE1skPa/vRaGeTOHaeG3APrLY8jg=; b=mo+ki4lFncWkfLM0qy8YSXqT19Bu7AGVZzmi8I2eQQE/F254DzKGrrXJuQpoQqVPmo s2nZ0dkc85qLWeKjJeqwnw6Um6luLTpqH1G/MireQ2vlnBnvcpRrtXKbJFxFZ82HNtJt Lexd2Cb3f4kJtsQBLOSMeZ9Ba0ardeT1c8UiO1VH2ZbRhoxVi55MMqPldjPHYguDqjkQ Teh9XS1/vPCntz8132/DD9ocotHwazUHIKdIEQU0bqn9HUtRyEGGKe52VBvszNtseQ5G Zk4aZRJ6g21OCIXCWoLb3sD71W0n30WvmJPXsyi5IpUAxnkenQkAXcnRXEuaGUQVVdxH aTag== X-Gm-Message-State: AOAM5314sS4yaVCIPSjxB+muNLo6giK4DOScFZWWsrzVSRn/YchYEP94 wfmpUv2LVKKqUBWbRCe/hhNHNw== X-Received: by 2002:a5d:6cd4:: with SMTP id c20mr14443657wrc.57.1610734400384; Fri, 15 Jan 2021 10:13:20 -0800 (PST) Received: from dell.default ([91.110.221.158]) by smtp.gmail.com with ESMTPSA id j2sm16123484wrh.78.2021.01.15.10.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 10:13:19 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 03/40] drm/vmwgfx/vmwgfx_execbuf: Fix some kernel-doc related issues Date: Fri, 15 Jan 2021 18:12:36 +0000 Message-Id: <20210115181313.3431493-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210115181313.3431493-1-lee.jones@linaro.org> References: <20210115181313.3431493-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Roland Scheidegger , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, VMware Graphics , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:89: warning: Enum value 'vmw_res_rel_max' not described in enum 'vmw_resource_relocation_type' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:136: warning: Function parameter or member 'func' not described in 'vmw_cmd_entry' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:136: warning: Function parameter or member 'cmd_name' not described in 'vmw_cmd_entry' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:212: warning: Function parameter or member 'res' not described in 'vmw_cmd_ctx_first_setup' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:523: warning: Function parameter or member 'sw_context' not described in 'vmw_resource_relocation_add' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:523: warning: Excess function parameter 'list' description in 'vmw_resource_relocation_add' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:653: warning: Function parameter or member 'p_res' not described in 'vmw_cmd_res_check' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:653: warning: Excess function parameter 'p_val' description in 'vmw_cmd_res_check' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:1716: warning: Function parameter or member 'res' not described in 'vmw_cmd_res_switch_backup' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:1716: warning: Excess function parameter 'val_node' description in 'vmw_cmd_res_switch_backup' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:3757: warning: Function parameter or member 'file_priv' not described in 'vmw_execbuf_fence_commands' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:3757: warning: Function parameter or member 'dev_priv' not described in 'vmw_execbuf_fence_commands' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:3757: warning: Function parameter or member 'p_fence' not described in 'vmw_execbuf_fence_commands' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:3757: warning: Function parameter or member 'p_handle' not described in 'vmw_execbuf_fence_commands' drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:3954: warning: Function parameter or member 'kernel_commands' not described in 'vmw_execbuf_cmdbuf' Cc: VMware Graphics Cc: Roland Scheidegger Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index 462f173207085..7a24196f92c38 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -80,7 +80,8 @@ struct vmw_relocation { * with a NOP. * @vmw_res_rel_cond_nop: Conditional NOP relocation. If the resource id after * validation is -1, the command is replaced with a NOP. Otherwise no action. - */ + * @vmw_res_rel_max: Last value in the enum - used for error checking +*/ enum vmw_resource_relocation_type { vmw_res_rel_normal, vmw_res_rel_nop, @@ -122,9 +123,11 @@ struct vmw_ctx_validation_info { /** * struct vmw_cmd_entry - Describe a command for the verifier * + * @func: Call-back to handle the command. * @user_allow: Whether allowed from the execbuf ioctl. * @gb_disable: Whether disabled if guest-backed objects are available. * @gb_enable: Whether enabled iff guest-backed objects are available. + * @cmd_name: Name of the command. */ struct vmw_cmd_entry { int (*func) (struct vmw_private *, struct vmw_sw_context *, @@ -203,6 +206,7 @@ static void vmw_bind_dx_query_mob(struct vmw_sw_context *sw_context) * * @dev_priv: Pointer to the device private: * @sw_context: The command submission context + * @res: Pointer to the resource * @node: The validation node holding the context resource metadata */ static int vmw_cmd_ctx_first_setup(struct vmw_private *dev_priv, @@ -509,7 +513,7 @@ static int vmw_resource_context_res_add(struct vmw_private *dev_priv, /** * vmw_resource_relocation_add - Add a relocation to the relocation list * - * @list: Pointer to head of relocation list. + * @sw_context: Pointer to the software context. * @res: The resource. * @offset: Offset into the command buffer currently being parsed where the id * that needs fixup is located. Granularity is one byte. @@ -639,7 +643,7 @@ static int vmw_resources_reserve(struct vmw_sw_context *sw_context) * @converter: User-space visisble type specific information. * @id_loc: Pointer to the location in the command buffer currently being parsed * from where the user-space resource id handle is located. - * @p_val: Pointer to pointer to resource validalidation node. Populated on + * @p_res: Pointer to pointer to resource validalidation node. Populated on * exit. */ static int @@ -1700,7 +1704,7 @@ static int vmw_cmd_check_define_gmrfb(struct vmw_private *dev_priv, * * @dev_priv: Pointer to a device private struct. * @sw_context: The software context being used for this batch. - * @val_node: The validation node representing the resource. + * @res: Pointer to the resource. * @buf_id: Pointer to the user-space backup buffer handle in the command * stream. * @backup_offset: Offset of backup into MOB. @@ -3739,7 +3743,7 @@ static int vmw_resize_cmd_bounce(struct vmw_sw_context *sw_context, return 0; } -/** +/* * vmw_execbuf_fence_commands - create and submit a command stream fence * * Creates a fence object and submits a command stream marker. @@ -3939,9 +3943,9 @@ static int vmw_execbuf_submit_cmdbuf(struct vmw_private *dev_priv, * On successful return, the function returns a pointer to the data in the * command buffer and *@header is set to non-NULL. * - * If command buffers could not be used, the function will return the value of - * @kernel_commands on function call. That value may be NULL. In that case, the - * value of *@header will be set to NULL. + * @kernel_commands: If command buffers could not be used, the function will + * return the value of @kernel_commands on function call. That value may be + * NULL. In that case, the value of *@header will be set to NULL. * * If an error is encountered, the function will return a pointer error value. * If the function is interrupted by a signal while sleeping, it will return