Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp725853pxj; Thu, 20 May 2021 21:11:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYE835dzSKyURstrgx9BbLPToq0s3jzmsqsMSxcfmUy7hGDRV3/wtb/y5aaxeO0oOxugmf X-Received: by 2002:a17:906:f283:: with SMTP id gu3mr8108823ejb.91.1621570279335; Thu, 20 May 2021 21:11:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621570279; cv=none; d=google.com; s=arc-20160816; b=Fh+WrJdbN74xtxuO+AVE37/NQz5nu1Z87DKqB954K37QOoHhHIxYdZKAE9TC7yfVb0 UpIJqXdMMWojDWKgaLmTt1knpVCrbeHYJkvC/rs+SfzKuVNVf1eeMzmrHvaaKVIaFmLt Xs8UU/TGJ1o7bHD/uYmO3BAhXKuzOMjrOZkYFFKzgcX6wzUiFB86fVou0DFzmgg0Wn9f lea897lOQLt66jghvJcMbyY7++G690j6FoQpZAGGHNioTvLU1123L7krJGL4tiqTEpBl x1+FhotYYQG1zoRfvO1PRZNT0bg0PO6PeivlNX6H7rcNLkILFOBUu16hEiADE73VxcPF 9LWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EkPRRoz7F84TTvDB6+0jP5Wh7M4ODElC4NQcMjBtFnE=; b=wgaadevIC2XNevpS0td9I1Hyo5XH4hoUzW/brMzIzNkcO/xQPD5xeGplY448Bq217s vNjC7o4Zy5mpnwludX/3iJWQTiJZ8EeewpsZz96BAu7gflbMsF+P/fxGTH5dkd416Cdd IsvSkjV980t0n+MSUiqJLMNY+UckPIaByEeIU/eYOAspvvkYvMVb/gkzJQKdUEOjYeu8 5e5k80/k7RmZVle9bKCO1ocRgLCSqzTO7hDCK986nOuEWU5i1E9p+eK1Wv6D1kY1BZWj RHy7zFmydjXtfpnVSAbAph1gLIqftGqDkx7z9JsLHXuamJ5ABeWC8AZNIg3INpPHZCj0 WPIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C7sgYTiA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lu22si4251792ejb.51.2021.05.20.21.10.44; Thu, 20 May 2021 21:11:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C7sgYTiA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242989AbhETMpb (ORCPT + 99 others); Thu, 20 May 2021 08:45:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242363AbhETMns (ORCPT ); Thu, 20 May 2021 08:43:48 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B796DC0611AD for ; Thu, 20 May 2021 05:03:09 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id l11-20020a05600c4f0bb029017a7cd488f5so2424546wmq.0 for ; Thu, 20 May 2021 05:03:09 -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=EkPRRoz7F84TTvDB6+0jP5Wh7M4ODElC4NQcMjBtFnE=; b=C7sgYTiANrC4NQXV+e5udHxsCPzVZnTdUONTGFy0elAjMgOr4a4/G1J+MxGPYWhgeG fKGfGMfyFUqP/jfVk/15fcyt5KfukAI0rN0/N2CeMI481eYGwA/ae2yAGB5r+KY8XBHU WS7b7Qm8Ple3GdMdCYcMp+hm6XJtj1QmCU9DJk9LqD58oSjspNVNWGzgWaitErSc4qWm NMIpVZzr8aIs+wkkMsvfH0oKbSph/Ecueoe50rcU9k85CjFRwvRRmZROlZdtpcEc19U9 YWDrGUfx/MmdtGpYp/+KlYsxMkUJg5YvQj8KD4ya/3Nq0FnI2SucE+lTMo8DIpSGJcX6 ygwA== 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=EkPRRoz7F84TTvDB6+0jP5Wh7M4ODElC4NQcMjBtFnE=; b=qPfizgsgGAT26hr6U+0DiW71yl+rOYoweJhCl35P38lfsXUj9NRJnOxWM6nnAwDa3Y CXnkIR9JDPG7/2rPGvTsfzaiB+Vl6XeCp9qb6xQ/P84v8MnGWhH1oKiKQFsrW91x1/OL RwGd9c4bqOOEcMZZlqv4h+3IyMNiGGij7UtAxYFCncUloi3mDN5YGOe7NXdepa5xN2J9 weypQT9S9hZvcX2yjkSL40FRan6/jVqUCTbQFG4JfazA6cy0dGS+5UDRbGsglrVJOkFM aYQIybo1xOL4/t+0FY6DPUnSL/a9zixMzkfKqGsoKRGfCFYkMojsxm17F3IUvoDq1hBT 4hHQ== X-Gm-Message-State: AOAM5332g0s8TiuHBb4HY0YPwFrSP/rMoX6DEyZttpILq9J//2uP460x Eeg/uHo0oLTu/g/PxWF3MD66Kw== X-Received: by 2002:a7b:c8ce:: with SMTP id f14mr3283573wml.81.1621512188364; Thu, 20 May 2021 05:03:08 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm2886332wrt.32.2021.05.20.05.03.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:03:07 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Daniel Vetter , Sumit Semwal , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 16/38] drm/amd/amdgpu/si_dma: Fix some function name disparity Date: Thu, 20 May 2021 13:02:26 +0100 Message-Id: <20210520120248.3464013-17-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/amd/amdgpu/si_dma.c:320: warning: expecting prototype for cik_dma_vm_copy_pte(). Prototype was for si_dma_vm_copy_pte() instead drivers/gpu/drm/amd/amdgpu/si_dma.c:412: warning: expecting prototype for si_dma_pad_ib(). Prototype was for si_dma_ring_pad_ib() instead drivers/gpu/drm/amd/amdgpu/si_dma.c:425: warning: expecting prototype for cik_sdma_ring_emit_pipeline_sync(). Prototype was for si_dma_ring_emit_pipeline_sync() instead 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/si_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c index cb703e307238d..195b45bcb8ad9 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c @@ -305,7 +305,7 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout) } /** - * cik_dma_vm_copy_pte - update PTEs by copying them from the GART + * si_dma_vm_copy_pte - update PTEs by copying them from the GART * * @ib: indirect buffer to fill with commands * @pe: addr of the page entry @@ -402,7 +402,7 @@ static void si_dma_vm_set_pte_pde(struct amdgpu_ib *ib, } /** - * si_dma_pad_ib - pad the IB to the required number of dw + * si_dma_ring_pad_ib - pad the IB to the required number of dw * * @ring: amdgpu_ring pointer * @ib: indirect buffer to fill with padding @@ -415,7 +415,7 @@ static void si_dma_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) } /** - * cik_sdma_ring_emit_pipeline_sync - sync the pipeline + * si_dma_ring_emit_pipeline_sync - sync the pipeline * * @ring: amdgpu_ring pointer * -- 2.31.1