From patchwork Thu May 20 12:02:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 443251 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2223403jac; Thu, 20 May 2021 05:03:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGyl1AlFHTrSlA2pjcvRFOnn4pxwfEp+Qzc0tpTTulR/lKVzwvMoc2bZQtL0MerVFVkCQe X-Received: by 2002:a63:b206:: with SMTP id x6mr4248046pge.341.1621512208720; Thu, 20 May 2021 05:03:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621512208; cv=none; d=google.com; s=arc-20160816; b=oEsFeNuzcfRG+ZBrW7tW/EnwSxzdh3/ZoVGEk5H8MEYTJe/04IGHv/pChHE3R7V2eK /BbdJvB6hF9GRTSyX9e/y6N1Sgdx5suOLIR98NjflpNU/Q1Q5eQVCzNGNSusQZqq2BZo ek4axuIKzyijqsYVRooQ5aE5opkLiV6zaItnbJ3+2uTmjGwEoUBKpvAlNxYrodrWfmhF XER/SVkL4PbQ8JTiyo50MFhZfKNCu2Gq4yi5o9TIG/OFD/lH/xu1y3lwhx/LqPxzcObp 5UzpV66Th/FJZY1Dmh7QnGeyh+EVXHiJKBkcZMxutHFONoipcFYZ9K4JZTfckH8N/nap yq5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=p87lVshS5WtAkP+vwHETLCg2+KWBSmqiA1YnmqxNMnI=; b=Cvb/iOFEzOB/635jjmM6Y23pAGmAa1WAM1FkAOzmpU9aHbN1w/CMz1NnUzwldiJp05 olyuSgOPN/mcwMs99ALPGTbOR5f30N1dmBeO4NyWTOh0eLcP6WaZo5F+pZew7/0r1dr7 EfkQlOtOlV450+zQ/oAeA44sW+dGVjdZYe/j/IYpzX2CqHxrkdA1YrznLLFDSOo2Fpns gQ/0KQnypfJ61mm9I0XPl7Yb1jmwKTcW+c82ep2YMIJOaKLmbKe6zVm8yc9sMRiR7njN osdXMH2egPKG+BYFgrTF66BkJ5Dak3WjDYN1Ijooz4dQ9FswNbLZX68piZHPmlsPDW6T lDXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a0NIQqA5; 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 d6si2509156plg.253.2021.05.20.05.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:03:28 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=a0NIQqA5; 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 839BE89700; Thu, 20 May 2021 12:03:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by gabe.freedesktop.org (Postfix) with ESMTPS id 868776F411 for ; Thu, 20 May 2021 12:03:06 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id z17so17370324wrq.7 for ; Thu, 20 May 2021 05:03:06 -0700 (PDT) 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=p87lVshS5WtAkP+vwHETLCg2+KWBSmqiA1YnmqxNMnI=; b=a0NIQqA5rLn8/zDIH1ZHgTKtjrdQNFOqYKVUhlTWUmu+HMX/QdYMhzdfw1vnVRI6h9 5ftpgP6sU1hD4Yn0LY+AZQcGCSfvqqS1Z0rNcyjthxY2amFnTWc+tBhkI+IXvW6ISVPy Znuiyk6IycvT5V+n60HIOQd+Agl7RJ2VvoUzoTkPlhNskqEB+uSoeWDAft89rOUwhqOn GJskOcGB3CvTGt/Qy4NqIM/pw4JTKpD6N1mdJVmotEQdhStQMDA1j/V3xJBruo5ull0c 96oVQpgw0QpTNeNkj73P8Zfrg3kq8efATw2NO6gQqRt5Uxk5RXecfUzUiHsY24AKuzno pMBw== 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=p87lVshS5WtAkP+vwHETLCg2+KWBSmqiA1YnmqxNMnI=; b=bDJxE9l9IUMXH9XQLRgP+pP+4wZqvMMhxtnshyy7/QUrYbr/DqUcyXleiOP187SnXB h53BfAYGL94clRCWsCol62gdwd1wGw0ScSh0UIzUYSotWNG6Sk/MNFo8dGAAmpOpux9c GBl7bfe5aHsCijjRO3huUPAvUI1DoU11JYiY43+WdqzLXT9f9+67aRghATji4j4vxEtF 52q8jCyY1NkzywypTQuF1jFpV6X7U9TijzhgefDp2Oimz8jLH5MWZSeNY6wSVGdU9adG nUQ4Bsal8YaC3ZRPck6ZgWWhAGBeR3Uln6kGILlWfLtY9C4rPf7K0IrpRNzai4Vjdli5 TVZg== X-Gm-Message-State: AOAM532oixB00tf1slMzItHsysBJgvIkh4IMx3aaZlAX17DYZfmwHx5A BYIp7+grxULwNxUoi0g8FRe4/w== X-Received: by 2002:adf:f80f:: with SMTP id s15mr3888694wrp.341.1621512185252; Thu, 20 May 2021 05:03:05 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm2886332wrt.32.2021.05.20.05.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:03:04 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 13/38] drm/amd/amdgpu/cik_sdma: Fix a few incorrectly named functions Date: Thu, 20 May 2021 13:02:23 +0100 Message-Id: <20210520120248.3464013-14-lee.jones@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520120248.3464013-1-lee.jones@linaro.org> References: <20210520120248.3464013-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 , Evan Quan , 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/cik_sdma.c:735: warning: expecting prototype for cik_sdma_vm_copy_pages(). Prototype was for cik_sdma_vm_copy_pte() instead drivers/gpu/drm/amd/amdgpu/cik_sdma.c:762: warning: expecting prototype for cik_sdma_vm_write_pages(). Prototype was for cik_sdma_vm_write_pte() instead drivers/gpu/drm/amd/amdgpu/cik_sdma.c:792: warning: expecting prototype for cik_sdma_vm_set_pages(). Prototype was for cik_sdma_vm_set_pte_pde() instead drivers/gpu/drm/amd/amdgpu/cik_sdma.c:814: warning: expecting prototype for cik_sdma_vm_pad_ib(). Prototype was for cik_sdma_ring_pad_ib() instead Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: Evan Quan 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/cik_sdma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.31.1 diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index c4bb8eed246d6..c8ebd108548d3 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c @@ -720,7 +720,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout) } /** - * cik_sdma_vm_copy_pages - update PTEs by copying them from the GART + * cik_sdma_vm_copy_pte - update PTEs by copying them from the GART * * @ib: indirect buffer to fill with commands * @pe: addr of the page entry @@ -746,7 +746,7 @@ static void cik_sdma_vm_copy_pte(struct amdgpu_ib *ib, } /** - * cik_sdma_vm_write_pages - update PTEs by writing them manually + * cik_sdma_vm_write_pte - update PTEs by writing them manually * * @ib: indirect buffer to fill with commands * @pe: addr of the page entry @@ -775,7 +775,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe, } /** - * cik_sdma_vm_set_pages - update the page tables using sDMA + * cik_sdma_vm_set_pte_pde - update the page tables using sDMA * * @ib: indirect buffer to fill with commands * @pe: addr of the page entry @@ -804,7 +804,7 @@ static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, } /** - * cik_sdma_vm_pad_ib - pad the IB to the required number of dw + * cik_sdma_ring_pad_ib - pad the IB to the required number of dw * * @ring: amdgpu_ring structure holding ring information * @ib: indirect buffer to fill with padding