[PATCH 1/4] drm/amdgpu/vcn: Share vcn_v2_0_dec_ring_test_ring to vcn2.5

[Leo Liu]

This patch is

Reviewed-by: Leo Liu <leo.liu at amd.com>

On 2020-01-21 11:19 a.m., James Zhu wrote:
> Share vcn_v2_0_dec_ring_test_ring to vcn2.5 to support
> vcn software ring.
>
> Signed-off-by: James Zhu <James.Zhu at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 1 +
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
>   3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index f4db8af6..e2ad5afe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -1624,7 +1624,7 @@ static int vcn_v2_0_process_interrupt(struct amdgpu_device *adev,
>   	return 0;
>   }
>   
> -static int vcn_v2_0_dec_ring_test_ring(struct amdgpu_ring *ring)
> +int vcn_v2_0_dec_ring_test_ring(struct amdgpu_ring *ring)
>   {
>   	struct amdgpu_device *adev = ring->adev;
>   	uint32_t tmp = 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h
> index ef749b0..6c9de18 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h
> @@ -37,6 +37,7 @@ extern void vcn_v2_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,
>   				unsigned vmid, uint64_t pd_addr);
>   extern void vcn_v2_0_dec_ring_emit_wreg(struct amdgpu_ring *ring,
>   				uint32_t reg, uint32_t val);
> +extern int vcn_v2_0_dec_ring_test_ring(struct amdgpu_ring *ring);
>   
>   extern void vcn_v2_0_enc_ring_insert_end(struct amdgpu_ring *ring);
>   extern void vcn_v2_0_enc_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index c8b63d5..c351d1a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -1488,7 +1488,7 @@ static const struct amdgpu_ring_funcs vcn_v2_5_dec_ring_vm_funcs = {
>   	.emit_ib = vcn_v2_0_dec_ring_emit_ib,
>   	.emit_fence = vcn_v2_0_dec_ring_emit_fence,
>   	.emit_vm_flush = vcn_v2_0_dec_ring_emit_vm_flush,
> -	.test_ring = amdgpu_vcn_dec_ring_test_ring,
> +	.test_ring = vcn_v2_0_dec_ring_test_ring,
>   	.test_ib = amdgpu_vcn_dec_ring_test_ib,
>   	.insert_nop = vcn_v2_0_dec_ring_insert_nop,
>   	.insert_start = vcn_v2_0_dec_ring_insert_start,