[PATCH 1/2] drm/amdgpu/vcn: use amdgpu_ring_test_helper instead of

[James Zhu]

Reviewed-by: James Zhu <James.Zhu at amd.com> for this series

On 2019-10-01 6:17 p.m., Liu, Leo wrote:
> amdgpu_ring_test_ring, so it will determine whether the ring is ready
>
> Signed-off-by: Leo Liu <leo.liu at amd.com>
> Cc: Gustavo A. R. Silva <gustavo at embeddedor.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c |  1 -
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 21 ++++++---------------
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 18 ++++++------------
>   3 files changed, 12 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index 93b3500e522b..b4f84a820a44 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -202,7 +202,6 @@ static int vcn_v1_0_hw_init(void *handle)
>   
>   	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
>   		ring = &adev->vcn.inst->ring_enc[i];
> -		ring->sched.ready = true;
>   		r = amdgpu_ring_test_helper(ring);
>   		if (r)
>   			goto done;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index 4628fd10a9ec..38f787a560cb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -247,30 +247,21 @@ static int vcn_v2_0_hw_init(void *handle)
>   	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
>   					     ring->doorbell_index, 0);
>   
> -	ring->sched.ready = true;
> -	r = amdgpu_ring_test_ring(ring);
> -	if (r) {
> -		ring->sched.ready = false;
> +	r = amdgpu_ring_test_helper(ring);
> +	if (r)
>   		goto done;
> -	}
>   
>   	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
>   		ring = &adev->vcn.inst->ring_enc[i];
> -		ring->sched.ready = true;
> -		r = amdgpu_ring_test_ring(ring);
> -		if (r) {
> -			ring->sched.ready = false;
> +		r = amdgpu_ring_test_helper(ring);
> +		if (r)
>   			goto done;
> -		}
>   	}
>   
>   	ring = &adev->vcn.inst->ring_jpeg;
> -	ring->sched.ready = true;
> -	r = amdgpu_ring_test_ring(ring);
> -	if (r) {
> -		ring->sched.ready = false;
> +	r = amdgpu_ring_test_helper(ring);
> +	if (r)
>   		goto done;
> -	}
>   
>   done:
>   	if (!r)
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index bf8626e15b09..cc194444363f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -258,29 +258,23 @@ static int vcn_v2_5_hw_init(void *handle)
>   		adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
>   						     ring->doorbell_index, j);
>   
> -		r = amdgpu_ring_test_ring(ring);
> -		if (r) {
> -			ring->sched.ready = false;
> +		r = amdgpu_ring_test_helper(ring);
> +		if (r)
>   			goto done;
> -		}
>   
>   		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
>   			ring = &adev->vcn.inst[j].ring_enc[i];
>   			ring->sched.ready = false;
>   			continue;
> -			r = amdgpu_ring_test_ring(ring);
> -			if (r) {
> -				ring->sched.ready = false;
> +			r = amdgpu_ring_test_helper(ring);
> +			if (r)
>   				goto done;
> -			}
>   		}
>   
>   		ring = &adev->vcn.inst[j].ring_jpeg;
> -		r = amdgpu_ring_test_ring(ring);
> -		if (r) {
> -			ring->sched.ready = false;
> +		r = amdgpu_ring_test_helper(ring);
> +		if (r)
>   			goto done;
> -		}
>   	}
>   done:
>   	if (!r)