[PATCH] drm/amdgpu: use amdgpu_ring_test_helper when possible

[Christian König]

Am 25.02.20 um 14:42 schrieb Nirmoy Das:
> amdgpu_ring_test_helper already handles ring->sched.ready correctly
>
> Signed-off-by: Nirmoy Das <nirmoy.das at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c  | 9 ++-------
>   drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c  | 6 ++----
>   3 files changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index 0f960b498792..7403588684b3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -477,7 +477,7 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev)
>   		kiq->pmf->kiq_unmap_queues(kiq_ring, &adev->gfx.compute_ring[i],
>   					   RESET_QUEUES, 0, 0);
>   
> -	return amdgpu_ring_test_ring(kiq_ring);
> +	return amdgpu_ring_test_helper(kiq_ring);
>   }
>   
>   int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 36ce67ce4800..7703be14390e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -3156,12 +3156,7 @@ static int gfx_v10_0_kiq_enable_kgq(struct amdgpu_device *adev)
>   	for (i = 0; i < adev->gfx.num_gfx_rings; i++)
>   		kiq->pmf->kiq_map_queues(kiq_ring, &adev->gfx.gfx_ring[i]);
>   
> -	r = amdgpu_ring_test_ring(kiq_ring);
> -	if (r) {
> -		DRM_ERROR("kfq enable failed\n");
> -		kiq_ring->sched.ready = false;
> -	}
> -	return r;
> +	return amdgpu_ring_test_helper(kiq_ring);
>   }
>   #endif
>   
> @@ -3777,7 +3772,7 @@ static int gfx_v10_0_kiq_disable_kgq(struct amdgpu_device *adev)
>   		kiq->pmf->kiq_unmap_queues(kiq_ring, &adev->gfx.gfx_ring[i],
>   					   PREEMPT_QUEUES, 0, 0);
>   
> -	return amdgpu_ring_test_ring(kiq_ring);
> +	return amdgpu_ring_test_helper(kiq_ring);
>   }
>   #endif
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> index 5af66a24b0a2..8ed9d42783e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> @@ -743,11 +743,9 @@ static int sdma_v5_0_gfx_resume(struct amdgpu_device *adev)
>   			sdma_v5_0_enable(adev, true);
>   		}
>   
> -		r = amdgpu_ring_test_ring(ring);
> -		if (r) {
> -			ring->sched.ready = false;
> +		r = amdgpu_ring_test_helper(ring);
> +		if (r)
>   			return r;
> -		}
>   
>   		if (adev->mman.buffer_funcs_ring == ring)
>   			amdgpu_ttm_set_buffer_funcs_status(adev, true);