On Tue, Nov 24, 2020 at 2:45 PM Lee Jones <lee.jo...@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:219: warning: Function parameter or 
> member 'bo' not described in 'uvd_v7_0_enc_get_create_msg'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:219: warning: Excess function 
> parameter 'adev' description in 'uvd_v7_0_enc_get_create_msg'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:282: warning: Function parameter or 
> member 'bo' not described in 'uvd_v7_0_enc_get_destroy_msg'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:282: warning: Excess function 
> parameter 'adev' description in 'uvd_v7_0_enc_get_destroy_msg'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:339: warning: Function parameter or 
> member 'timeout' not described in 'uvd_v7_0_enc_ring_test_ib'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:527: warning: Function parameter or 
> member 'handle' not described in 'uvd_v7_0_hw_init'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:527: warning: Excess function 
> parameter 'adev' description in 'uvd_v7_0_hw_init'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:605: warning: Function parameter or 
> member 'handle' not described in 'uvd_v7_0_hw_fini'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:605: warning: Excess function 
> parameter 'adev' description in 'uvd_v7_0_hw_fini'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1156: warning: Function parameter or 
> member 'addr' not described in 'uvd_v7_0_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1156: warning: Function parameter or 
> member 'seq' not described in 'uvd_v7_0_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1156: warning: Function parameter or 
> member 'flags' not described in 'uvd_v7_0_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1156: warning: Excess function 
> parameter 'fence' description in 'uvd_v7_0_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1195: warning: Function parameter or 
> member 'addr' not described in 'uvd_v7_0_enc_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1195: warning: Function parameter or 
> member 'seq' not described in 'uvd_v7_0_enc_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1195: warning: Function parameter or 
> member 'flags' not described in 'uvd_v7_0_enc_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1195: warning: Excess function 
> parameter 'fence' description in 'uvd_v7_0_enc_ring_emit_fence'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1293: warning: Function parameter or 
> member 'job' not described in 'uvd_v7_0_ring_emit_ib'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1293: warning: Function parameter or 
> member 'flags' not described in 'uvd_v7_0_ring_emit_ib'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1324: warning: Function parameter or 
> member 'job' not described in 'uvd_v7_0_enc_ring_emit_ib'
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c:1324: warning: Function parameter or 
> member 'flags' not described in 'uvd_v7_0_enc_ring_emit_ib'
>
> 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 fixes.  Thanks!

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c 
> b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> index b44c8677ce8d5..9911ff80a6776 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> @@ -206,9 +206,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring 
> *ring)
>  /**
>   * uvd_v7_0_enc_get_create_msg - generate a UVD ENC create msg
>   *
> - * @adev: amdgpu_device pointer
>   * @ring: ring we should submit the msg to
>   * @handle: session handle to use
> + * @bo: amdgpu object for which we query the offset
>   * @fence: optional fence to return
>   *
>   * Open up a stream for HW test
> @@ -269,9 +269,9 @@ static int uvd_v7_0_enc_get_create_msg(struct amdgpu_ring 
> *ring, uint32_t handle
>  /**
>   * uvd_v7_0_enc_get_destroy_msg - generate a UVD ENC destroy msg
>   *
> - * @adev: amdgpu_device pointer
>   * @ring: ring we should submit the msg to
>   * @handle: session handle to use
> + * @bo: amdgpu object for which we query the offset
>   * @fence: optional fence to return
>   *
>   * Close up a stream for HW test or if userspace failed to do so
> @@ -333,6 +333,7 @@ static int uvd_v7_0_enc_get_destroy_msg(struct 
> amdgpu_ring *ring, uint32_t handl
>   * uvd_v7_0_enc_ring_test_ib - test if UVD ENC IBs are working
>   *
>   * @ring: the engine to test on
> + * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT
>   *
>   */
>  static int uvd_v7_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> @@ -519,7 +520,7 @@ static int uvd_v7_0_sw_fini(void *handle)
>  /**
>   * uvd_v7_0_hw_init - start and test UVD block
>   *
> - * @adev: amdgpu_device pointer
> + * @handle: handle used to pass amdgpu_device pointer
>   *
>   * Initialize the hardware, boot up the VCPU and do some testing
>   */
> @@ -597,7 +598,7 @@ static int uvd_v7_0_hw_init(void *handle)
>  /**
>   * uvd_v7_0_hw_fini - stop the hardware block
>   *
> - * @adev: amdgpu_device pointer
> + * @handle: handle used to pass amdgpu_device pointer
>   *
>   * Stop the UVD block, mark ring as not ready any more
>   */
> @@ -1147,7 +1148,9 @@ static void uvd_v7_0_stop(struct amdgpu_device *adev)
>   * uvd_v7_0_ring_emit_fence - emit an fence & trap command
>   *
>   * @ring: amdgpu_ring pointer
> - * @fence: fence to emit
> + * @addr: address
> + * @seq: sequence number
> + * @flags: fence related flags
>   *
>   * Write a fence and a trap command to the ring.
>   */
> @@ -1186,7 +1189,9 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring 
> *ring, u64 addr, u64 seq
>   * uvd_v7_0_enc_ring_emit_fence - emit an enc fence & trap command
>   *
>   * @ring: amdgpu_ring pointer
> - * @fence: fence to emit
> + * @addr: address
> + * @seq: sequence number
> + * @flags: fence related flags
>   *
>   * Write enc a fence and a trap command to the ring.
>   */
> @@ -1282,7 +1287,9 @@ static int uvd_v7_0_ring_patch_cs_in_place(struct 
> amdgpu_cs_parser *p,
>   * uvd_v7_0_ring_emit_ib - execute indirect buffer
>   *
>   * @ring: amdgpu_ring pointer
> + * @job: job to retrive vmid from
>   * @ib: indirect buffer to execute
> + * @flags: unused
>   *
>   * Write ring commands to execute the indirect buffer
>   */
> @@ -1313,7 +1320,9 @@ static void uvd_v7_0_ring_emit_ib(struct amdgpu_ring 
> *ring,
>   * uvd_v7_0_enc_ring_emit_ib - enc execute indirect buffer
>   *
>   * @ring: amdgpu_ring pointer
> + * @job: job to retrive vmid from
>   * @ib: indirect buffer to execute
> + * @flags: unused
>   *
>   * Write enc ring commands to execute the indirect buffer
>   */
> --
> 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

Reply via email to