On Mon, Nov 23, 2020 at 6:19 AM Lee Jones <lee.jo...@linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:226: warning: Function parameter or > member 'job' not described in 'cik_sdma_ring_emit_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:226: warning: Function parameter or > member 'flags' not described in 'cik_sdma_ring_emit_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Function parameter or > member 'addr' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Function parameter or > member 'seq' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Function parameter or > member 'flags' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Excess function > parameter 'fence' description in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:663: warning: Function parameter or > member 'timeout' not described in 'cik_sdma_ring_test_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:808: warning: Function parameter or > member 'ring' not described in 'cik_sdma_ring_pad_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:859: warning: Function parameter or > member 'vmid' not described in 'cik_sdma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:859: warning: Function parameter or > member 'pd_addr' not described in 'cik_sdma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:859: warning: Excess function > parameter 'vm' description in 'cik_sdma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1315: warning: Function parameter or > member 'ib' not described in 'cik_sdma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1315: warning: Function parameter or > member 'tmz' not described in 'cik_sdma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1315: warning: Excess function > parameter 'ring' description in 'cik_sdma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1339: warning: Function parameter or > member 'ib' not described in 'cik_sdma_emit_fill_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1339: warning: Excess function > parameter 'ring' description in 'cik_sdma_emit_fill_buffer' > > Cc: Alex Deucher <alexander.deuc...@amd.com> > Cc: "Christian König" <christian.koe...@amd.com> > Cc: David Airlie <airl...@linux.ie> > Cc: Daniel Vetter <dan...@ffwll.ch> > Cc: Sumit Semwal <sumit.sem...@linaro.org> > Cc: amd-...@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Cc: linux-me...@vger.kernel.org > Cc: linaro-mm-...@lists.linaro.org > Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Applied with minor changes. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > index 1a6494ea50912..f1e9966e7244e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > @@ -215,7 +215,9 @@ static void cik_sdma_ring_insert_nop(struct amdgpu_ring > *ring, uint32_t count) > * cik_sdma_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 (CIK). > */ > @@ -267,6 +269,8 @@ static void cik_sdma_ring_emit_hdp_flush(struct > amdgpu_ring *ring) > * cik_sdma_ring_emit_fence - emit a fence on the DMA ring > * > * @ring: amdgpu ring pointer > + * @addr: address > + * @seq: sequence number > * @fence: amdgpu fence object > * > * Add a DMA fence packet to the ring to write > @@ -655,6 +659,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring > *ring) > * cik_sdma_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 (CIK). > * Returns 0 on success, error on failure. > @@ -801,6 +806,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 > * > + * @ring: amdgpu_ring structure holding ring information > * @ib: indirect buffer to fill with padding > * > */ > @@ -849,7 +855,8 @@ static void cik_sdma_ring_emit_pipeline_sync(struct > amdgpu_ring *ring) > * cik_sdma_ring_emit_vm_flush - cik 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 (CIK). > @@ -1298,10 +1305,11 @@ static void cik_sdma_set_irq_funcs(struct > amdgpu_device *adev) > /** > * cik_sdma_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: unused > * > * Copy GPU buffers using the DMA engine (CIK). > * Used by the amdgpu ttm implementation to move pages if > @@ -1325,7 +1333,7 @@ static void cik_sdma_emit_copy_buffer(struct amdgpu_ib > *ib, > /** > * cik_sdma_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 > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
