From patchwork Tue Nov 24 19:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 331424 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp795825ilb; Tue, 24 Nov 2020 11:44:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxmTKE5zwb65L6CL55PB5rzuU6dW1XuByV26fmsHhceGgYhdVr1yVaMeL1ZTVi+ZCYdApX X-Received: by 2002:a17:90a:eb04:: with SMTP id j4mr167990pjz.103.1606247097091; Tue, 24 Nov 2020 11:44:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606247097; cv=none; d=google.com; s=arc-20160816; b=sLcPtpYJfjkOVI0KjkaChgTGBgM61w2mXPsxmz3Hgr1xfwBgZPKG0SwnOqcUyPMYHF GlUXshIEfkzoh/CQvDstwRbLe8UJFF34vQi0ABinW8ZscgggEf2X0UWXAx7ZyjXkeKAZ 5glhDNa0nL7hcggP0LL510BwB/wnHeioVFQo1cQglSINMJffJatrDYLEX52LtkRB3h6g SXnNHbz2hKAtmNloy3BXMfabj8WAZl5EdeqahiSXdmbfC9YOFFwBQx+yi9aorZtZNfUD QERgYIscCVcf23+K/1HxM5TKHCCcQ4IV8qXNPa/C7VA9Z9t40YxmizpHXffsgeHmJLwL vmYg== 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=fB4jaeWkI5JeGxPswGPaBOqc9pKpSRrE+/TeNTfG/NU=; b=jkJFHOyZ1hPRQKG8sudHW+xlKw/zwDZgjQhAJhH/IdHXCk4+rmtqsdbBgtyudJasMN R24ifEM6IWnW2g+2PUzRAYbOIgFOOlq5IVGrvJxx7ZpIqpz8V1AP1H1KTZLteZPZtmYx +biWVH3CL8U6Sb5NNGT3mWNmhu0zo+lBvaT/JTCA8swSBsZrR2z8Br+hyzk6P5XuXauV ab4N+AGZiTumVRLohwzPErCZwqmVQSSOXfooyY/U3ZN/WjhdL+DZVb9SpN4g4L/MU3pu aywuela4BEMG0MrrS5G9Bw5BqJIbkIcKT94Pl++0ThgKQVv0yLFgVS+uZTNUfccneWL3 6scw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=G+laA0ee; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id t4si14201103pgn.147.2020.11.24.11.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 11:44:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=G+laA0ee; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 876906E52F; Tue, 24 Nov 2020 19:44:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 872AC6E56D for ; Tue, 24 Nov 2020 19:44:30 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id 23so23519734wrc.8 for ; Tue, 24 Nov 2020 11:44:30 -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=zLv2tzTUg6hRfBb4zoaAZo803fwr+tjrjxHqDKZ3aM4=; b=G+laA0eevQxIooEg9oZfCmtU2VNwu5hMu7kSumImnDGETx9L6pdgsV3eGfxuOjSYfc cV134nVQp1nliAA6eGfB32pCi7J5zRtwGczpxL4TUBQptoHhawL+yDId60mP2r/cofCf LjW1x7MT9RBmHjuT+eI/nmfascGL8rrR4vccPYNMc0Hgz6PxK7n/T7AaWCB0KZB89AIt 1/+Eb4ol7k1ZhgqurMOsQufVwza6WMJ2c42MD/GaHf1tUfYvaWhZ/tkpz3X8SlHIFImo 0jguddZTdqtFQJH2FwN/v84EHKUiL4sxVDYJtIoxzdywP3+R2HdQgku5VM6EQrsMbKDV xd4Q== 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=zLv2tzTUg6hRfBb4zoaAZo803fwr+tjrjxHqDKZ3aM4=; b=TvPdd3Dy8JYznFO/ztpQVdrGBENTs9nKCUtGCUPRAGu3jLcKSVDUZgLHnsKzzbX829 za5Ha9n4+Ii3j+EseNhMeIpr6oijo6C21T6OSFOxlLYYIizmF43F4+MMg7stFmrt6fzm OFxkX7u744rOXc+YL3bSVVblSopdLKa5HhfOzQzr0yfts8pBBgaAcpe+53oEDArdPfNX GGkOTRRKmPTLHi4Oj1Vh4gilWI6lgvkFSMGKlpgWjK+bX4YVUGQWauzNS+EGIG/XQ5GM oaIzrVS6Rmpm4X3OYjttajN9XN1Hs7QcMlDYpdVahe3FBXx+YQnUPFnl4d9Q5EL0G1PP XArw== X-Gm-Message-State: AOAM5330SwnY//kMLi2+Q4EndcXSLTP8sE+MN9HbAdSdNPVx6pKUcLIM QXp+TV5tXQFt8AeVkTtJNBXeYw== X-Received: by 2002:a5d:4001:: with SMTP id n1mr105944wrp.176.1606247069198; Tue, 24 Nov 2020 11:44:29 -0800 (PST) Received: from dell.default ([91.110.221.235]) by smtp.gmail.com with ESMTPSA id d134sm200511wmd.8.2020.11.24.11.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 11:44:28 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 24/40] drm/amd/amdgpu/sdma_v5_2: Provide some missing and repair other function params Date: Tue, 24 Nov 2020 19:38:08 +0000 Message-Id: <20201124193824.1118741-25-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201124193824.1118741-1-lee.jones@linaro.org> References: <20201124193824.1118741-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 , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , 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/amd/amdgpu/sdma_v5_2.c:367: warning: Function parameter or member 'job' not described in 'sdma_v5_2_ring_emit_ib' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:367: warning: Function parameter or member 'flags' not described in 'sdma_v5_2_ring_emit_ib' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:429: warning: Function parameter or member 'addr' not described in 'sdma_v5_2_ring_emit_fence' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:429: warning: Function parameter or member 'seq' not described in 'sdma_v5_2_ring_emit_fence' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:429: warning: Function parameter or member 'flags' not described in 'sdma_v5_2_ring_emit_fence' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:429: warning: Excess function parameter 'fence' description in 'sdma_v5_2_ring_emit_fence' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:924: warning: Function parameter or member 'timeout' not described in 'sdma_v5_2_ring_test_ib' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1030: warning: Function parameter or member 'value' not described in 'sdma_v5_2_vm_write_pte' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1030: warning: Excess function parameter 'addr' description in 'sdma_v5_2_vm_write_pte' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1030: warning: Excess function parameter 'flags' description in 'sdma_v5_2_vm_write_pte' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1083: warning: Function parameter or member 'ring' not described in 'sdma_v5_2_ring_pad_ib' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1137: warning: Function parameter or member 'vmid' not described in 'sdma_v5_2_ring_emit_vm_flush' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1137: warning: Function parameter or member 'pd_addr' not described in 'sdma_v5_2_ring_emit_vm_flush' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1137: warning: Excess function parameter 'vm' description in 'sdma_v5_2_ring_emit_vm_flush' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1717: warning: Function parameter or member 'ib' not described in 'sdma_v5_2_emit_copy_buffer' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1717: warning: Function parameter or member 'tmz' not described in 'sdma_v5_2_emit_copy_buffer' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1717: warning: Excess function parameter 'ring' description in 'sdma_v5_2_emit_copy_buffer' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1743: warning: Function parameter or member 'ib' not described in 'sdma_v5_2_emit_fill_buffer' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c:1743: warning: Excess function parameter 'ring' description in 'sdma_v5_2_emit_fill_buffer' Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org 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/amd/amdgpu/sdma_v5_2.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c index cb5a6f1437f81..e8736360d1a9f 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c @@ -356,7 +356,9 @@ static void sdma_v5_2_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) * sdma_v5_2_ring_emit_ib - Schedule an IB on the DMA engine * * @ring: amdgpu ring pointer + * @job: job to retrive vmid from * @ib: IB object to schedule + * @flags: unused * * Schedule an IB in the DMA ring. */ @@ -418,7 +420,9 @@ static void sdma_v5_2_ring_emit_hdp_flush(struct amdgpu_ring *ring) * sdma_v5_2_ring_emit_fence - emit a fence on the DMA ring * * @ring: amdgpu ring pointer - * @fence: amdgpu fence object + * @addr: address + * @seq: sequence number + * @flags: fence related flags * * Add a DMA fence packet to the ring to write * the fence seq number and DMA trap packet to generate @@ -916,6 +920,7 @@ static int sdma_v5_2_ring_test_ring(struct amdgpu_ring *ring) * sdma_v5_2_ring_test_ib - test an IB on the DMA engine * * @ring: amdgpu_ring structure holding ring information + * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT * * Test a simple IB in the DMA ring. * Returns 0 on success, error on failure. @@ -1017,10 +1022,9 @@ static void sdma_v5_2_vm_copy_pte(struct amdgpu_ib *ib, * * @ib: indirect buffer to fill with commands * @pe: addr of the page entry - * @addr: dst addr to write into pe + * @value: dst addr to write into pe * @count: number of page entries to update * @incr: increase next addr by incr bytes - * @flags: access flags * * Update PTEs by writing them manually using sDMA. */ @@ -1076,6 +1080,7 @@ static void sdma_v5_2_vm_set_pte_pde(struct amdgpu_ib *ib, * sdma_v5_2_ring_pad_ib - pad the IB * * @ib: indirect buffer to fill with padding + * @ring: amdgpu_ring structure holding ring information * * Pad the IB with NOPs to a boundary multiple of 8. */ @@ -1127,7 +1132,8 @@ static void sdma_v5_2_ring_emit_pipeline_sync(struct amdgpu_ring *ring) * sdma_v5_2_ring_emit_vm_flush - vm flush using sDMA * * @ring: amdgpu_ring pointer - * @vm: amdgpu_vm pointer + * @vmid: vmid number to use + * @pd_addr: address * * Update the page table base and flush the VM TLB * using sDMA. @@ -1700,10 +1706,11 @@ static void sdma_v5_2_set_irq_funcs(struct amdgpu_device *adev) /** * sdma_v5_2_emit_copy_buffer - copy buffer using the sDMA engine * - * @ring: amdgpu_ring structure holding ring information + * @ib: indirect buffer to copy to * @src_offset: src GPU address * @dst_offset: dst GPU address * @byte_count: number of bytes to xfer + * @tmz: if a secure copy should be used * * Copy GPU buffers using the DMA engine. * Used by the amdgpu ttm implementation to move pages if @@ -1729,7 +1736,7 @@ static void sdma_v5_2_emit_copy_buffer(struct amdgpu_ib *ib, /** * sdma_v5_2_emit_fill_buffer - fill buffer using the sDMA engine * - * @ring: amdgpu_ring structure holding ring information + * @ib: indirect buffer to fill * @src_data: value to write to buffer * @dst_offset: dst GPU address * @byte_count: number of bytes to xfer