[PATCH 16/38] drm/amd/amdgpu/si_dma: Fix some function name disparity

Alex Deucher alexdeucher at gmail.com
Thu May 20 19:14:27 UTC 2021


Applied.  Thanks!

Alex

On Thu, May 20, 2021 at 8:04 AM Lee Jones <lee.jones at linaro.org> wrote:
>
> 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 <alexander.deucher at amd.com>
> Cc: "Christian König" <christian.koenig at amd.com>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal at linaro.org>
> Cc: amd-gfx at lists.freedesktop.org
> Cc: dri-devel at lists.freedesktop.org
> Cc: linux-media at vger.kernel.org
> Cc: linaro-mm-sig at lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones at linaro.org>
> ---
>  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
>


More information about the dri-devel mailing list