Commit 184b762d authored by Lee Jones's avatar Lee Jones Committed by Alex Deucher
Browse files

drm/amd/amdgpu/amdgpu_vce: Provide some missing and repair other function params 



Fixes the following W=1 kernel build warning(s):

 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:97: warning: Function parameter or member 'size' not described in 'amdgpu_vce_sw_init'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:441: warning: Function parameter or member 'bo' not described in 'amdgpu_vce_get_create_msg'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:441: warning: Excess function parameter 'adev' description in 'amdgpu_vce_get_create_msg'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:521: warning: Function parameter or member 'direct' not described in 'amdgpu_vce_get_destroy_msg'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:521: warning: Excess function parameter 'adev' description in 'amdgpu_vce_get_destroy_msg'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:588: warning: Function parameter or member 'ib_idx' not described in 'amdgpu_vce_validate_bo'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:636: warning: Function parameter or member 'ib_idx' not described in 'amdgpu_vce_cs_reloc'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:636: warning: Function parameter or member 'index' not described in 'amdgpu_vce_cs_reloc'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:720: warning: Function parameter or member 'ib_idx' not described in 'amdgpu_vce_ring_parse_cs'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:956: warning: Function parameter or member 'ib_idx' not described in 'amdgpu_vce_ring_parse_cs_vm'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1050: warning: Function parameter or member 'job' not described in 'amdgpu_vce_ring_emit_ib'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1050: warning: Function parameter or member 'flags' not described in 'amdgpu_vce_ring_emit_ib'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1066: warning: Function parameter or member 'addr' not described in 'amdgpu_vce_ring_emit_fence'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1066: warning: Function parameter or member 'seq' not described in 'amdgpu_vce_ring_emit_fence'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1066: warning: Function parameter or member 'flags' not described in 'amdgpu_vce_ring_emit_fence'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1066: warning: Excess function parameter 'fence' description in 'amdgpu_vce_ring_emit_fence'
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:1122: warning: Function parameter or member 'timeout' not described in 'amdgpu_vce_ring_test_ib'

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
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: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fd1c541d

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

+14 −5
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, 
 * amdgpu_vce_init - allocate memory, load vce firmware

 *

 * @adev: amdgpu_device pointer

 * @size: size for the new BO

 *

 * First step to get VCE online, allocate memory and load the firmware

 */
@@ -428,9 +429,9 @@ void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp) 
/**

 * amdgpu_vce_get_create_msg - generate a VCE create msg

 *

 * @adev: amdgpu_device pointer

 * @ring: ring we should submit the msg to

 * @handle: VCE 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
@@ -509,9 +510,9 @@ static int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, 
/**

 * amdgpu_vce_get_destroy_msg - generate a VCE destroy msg

 *

 * @adev: amdgpu_device pointer

 * @ring: ring we should submit the msg to

 * @handle: VCE session handle to use

 * @direct: direct or delayed pool

 * @fence: optional fence to return

 *

 * Close up a stream for HW test or if userspace failed to do so
@@ -576,6 +577,7 @@ static int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, 
 * amdgpu_vce_cs_validate_bo - make sure not to cross 4GB boundary

 *

 * @p: parser context

 * @ib_idx: indirect buffer to use

 * @lo: address of lower dword

 * @hi: address of higher dword

 * @size: minimum size
@@ -625,9 +627,11 @@ static int amdgpu_vce_validate_bo(struct amdgpu_cs_parser *p, uint32_t ib_idx, 
 * amdgpu_vce_cs_reloc - command submission relocation

 *

 * @p: parser context

 * @ib_idx: indirect buffer to use

 * @lo: address of lower dword

 * @hi: address of higher dword

 * @size: minimum size

 * @index: bs/fb index

 *

 * Patch relocation inside command stream with real buffer address

 */
@@ -714,7 +718,7 @@ static int amdgpu_vce_validate_handle(struct amdgpu_cs_parser *p, 
 * amdgpu_vce_cs_parse - parse and validate the command stream

 *

 * @p: parser context

 *

 * @ib_idx: indirect buffer to use

 */

int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx)

{
@@ -950,7 +954,7 @@ int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx) 
 * amdgpu_vce_cs_parse_vm - parse the command stream in VM mode

 *

 * @p: parser context

 *

 * @ib_idx: indirect buffer to use

 */

int amdgpu_vce_ring_parse_cs_vm(struct amdgpu_cs_parser *p, uint32_t ib_idx)

{
@@ -1040,7 +1044,9 @@ int amdgpu_vce_ring_parse_cs_vm(struct amdgpu_cs_parser *p, uint32_t ib_idx) 
 * amdgpu_vce_ring_emit_ib - execute indirect buffer

 *

 * @ring: engine to use

 * @job: job to retrieve vmid from

 * @ib: the IB to execute

 * @flags: unused

 *

 */

void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,
@@ -1058,7 +1064,9 @@ void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring, 
 * amdgpu_vce_ring_emit_fence - add a fence command to the ring

 *

 * @ring: engine to use

 * @fence: the fence

 * @addr: address

 * @seq: sequence number

 * @flags: fence related flags

 *

 */

void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq,
@@ -1116,6 +1124,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) 
 * amdgpu_vce_ring_test_ib - test if VCE IBs are working

 *

 * @ring: the engine to test on

 * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT

 *

 */

int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)