Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp852714pxj; Fri, 21 May 2021 00:10:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYaNqRONpwURu4gG31KqMK3iLRaxa+mjj9pXrohqcCzbV+VaKJ9bOjAZYIRbf7pRcu9b5t X-Received: by 2002:aa7:cd8b:: with SMTP id x11mr9625437edv.87.1621581009129; Fri, 21 May 2021 00:10:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621581009; cv=none; d=google.com; s=arc-20160816; b=CeYAFhGoI7K4gFBRioDd6N23DLIz9t0+T4Es+/G+NVdRNblkNXfiEI4+Oan8Mtmm/C 0HwGhL5/PvTfXVW0hqVpTBjM6pX7viJa92hCsEnfQ6wH7FNGOy1tZLRUH+akRmW7PPU5 /Y68EPoHuB9Em8IQeH7AEq6wsn/KOP8aF6YTrzphUSSInJb1LVgDLkfJy6zc+25z7pir v+N0IWSfX8CXwdAhkd2a6nSDpSLFUPIzMJTANtAQi72Ch5WNEFv0pzYb+AZ2gtIyycsD a+Aum8YgeDqNkAvf4uvxJt5W0mVtrBRGZJK9Xz2HadtDuslAMnzpr+oNRvm2FHEBEz0p /ctA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=CFznQ5UzwVzYSrYk++bKt7INj01icNDyVEHe4lOS4xc=; b=EV8aqFQsHtlZ0THhzUyiRepU9EOiel6odR8Vi7mJ5gNFmtfv78lPfSIYAZSXUaIPgP RN4zwfYhRna1A0bFk7NSx9tfDmHghIdioGHfvynVHQuIddT415yXwiQ09y0oFbyEmibP XAa3iElVBy9LyKodHTp/cPaiUZmaYoy27KPAH6YGkgajaAFHvbTIgSQBun5HBXpU1ACw znkArEeEMeTkT7qQKl+nhCIPQt0ibqDU6UPxmsOCH2SHwqm48euDPN8tkIEKLp60oldQ 2Ptd41ij/5SRSksi0Eiqo/JfJPDzLOcdk5b58DTw5AifTWb3VfjvC0vfBoVO2RszRAd7 BJZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=oE4NN5Aj; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i27si4494916ejh.691.2021.05.21.00.09.45; Fri, 21 May 2021 00:10:09 -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=@gmail.com header.s=20161025 header.b=oE4NN5Aj; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236196AbhETTQJ (ORCPT + 99 others); Thu, 20 May 2021 15:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237676AbhETTQF (ORCPT ); Thu, 20 May 2021 15:16:05 -0400 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB543C06138E; Thu, 20 May 2021 12:14:38 -0700 (PDT) Received: by mail-ot1-x32c.google.com with SMTP id v19-20020a0568301413b0290304f00e3d88so15835231otp.4; Thu, 20 May 2021 12:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=CFznQ5UzwVzYSrYk++bKt7INj01icNDyVEHe4lOS4xc=; b=oE4NN5AjJr7IrcZo1Es/vlSqvlT754NfJM7Mfc3xB6CSK7ll+/YvAtbQ2mR8AmC2BT sqS5dDVeSrEVWayFMSVJDASe9FKfS/Wr+qazoBbhp1Mr5/3hGxEj3m4HbdwTGxSA57TV tsUkAfXtKbZiSLaKd7b6iQvIx1PLbFfsvdI70eiZVuoimjccc7Oj24jOCjMZq8sDyO2X Gv0+5ths4rebFvxoKAo+njIxd/9sGHIKha8J/mMF2dIP6p44evYd0zbysZmm2eSWaG0V O5f+2Aw+n+upOXSmQcSvJZizKUNdhUyUqPutN+1XKRyxG3dHqSjSG6i6PLNAiQvAa5GA WMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=CFznQ5UzwVzYSrYk++bKt7INj01icNDyVEHe4lOS4xc=; b=LGKyZoLRfYbFhIBrPGHw8Uo5R5S/zIWqfXfoYMAjBPUnSslbKhVTiA5cQTUryclztX QX/CKgAMl6tPnW8NFfLnAteD9TN5wPX7DAJ3j0lnG008NgRq+Q1DSkDjYJfHGHP/yi0T 9PE2rzGAp4VgXmqX5pFCh1BMq1Vc3KXtQYJ/1KkhPgkF+qvpQsEBDI94A4HN7jPH/KZQ 0M93+VF2EcRUzAPIsu7AkNL9/7QvKzB2Xnh81Mi/JxRlabIUh5HSjLeJaR+DLBFM1cKE DmGl5bQjT1VNahbYuHePFcB+h6QIPXI80UcVr2IQqe5vgam/jBgd5fGLKwYRNkUxtV77 st9w== X-Gm-Message-State: AOAM530jE5SbXtkqfkDdhikkQPwWKedZejOyMbfoGce/qJwnQvAMflxI U+pgAW0G5XBCEg6EDMW3gKGfFB8kRF6zbHOunMw= X-Received: by 2002:a9d:57cd:: with SMTP id q13mr5103104oti.23.1621538078199; Thu, 20 May 2021 12:14:38 -0700 (PDT) MIME-Version: 1.0 References: <20210520120248.3464013-1-lee.jones@linaro.org> <20210520120248.3464013-17-lee.jones@linaro.org> In-Reply-To: <20210520120248.3464013-17-lee.jones@linaro.org> From: Alex Deucher Date: Thu, 20 May 2021 15:14:27 -0400 Message-ID: Subject: Re: [PATCH 16/38] drm/amd/amdgpu/si_dma: Fix some function name disparity To: Lee Jones Cc: David Airlie , LKML , amd-gfx list , =?UTF-8?Q?Christian_K=C3=B6nig?= , "moderated list:DMA BUFFER SHARING FRAMEWORK" , Maling list - DRI developers , Alex Deucher , linux-media Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Applied. Thanks! Alex On Thu, May 20, 2021 at 8:04 AM Lee Jones wrote: > > Fixes the following W=3D1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/si_dma.c:320: warning: expecting prototype fo= r 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 fo= r 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 fo= r cik_sdma_ring_emit_pipeline_sync(). Prototype was for si_dma_ring_emit_pi= peline_sync() instead > > Cc: Alex Deucher > Cc: "Christian K=C3=B6nig" > 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/am= dgpu/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 *ri= ng, 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 *i= b, > } > > /** > - * 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 *ri= ng, 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 >