[PATCH 4/8] drm/amdgpu: Skip uvd and vce ring test for SRIOV

[Alex Deucher]

On Tue, Jul 25, 2017 at 5:17 AM, Xiangliang.Yu <Xiangliang.Yu at amd.com> wrote:
> From: Frank Min <Frank.Min at amd.com>
>
> Since rptr would not be accessed on later secure asics in sriov, remove
> the ring test.
>
> Signed-off-by: Frank Min <Frank.Min at amd.com>
> Signed-off-by: Xiangliang.Yu <Xiangliang.Yu at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++--
>  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c   | 3 +++
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index b692ad4..c855366 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -937,9 +937,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
>         unsigned i;
>         int r, timeout = adev->usec_timeout;
>
> -       /* workaround VCE ring test slow issue for sriov*/
> +       /* skip ring test for sriov*/
>         if (amdgpu_sriov_vf(adev))
> -               timeout *= 10;
> +               return 0;
>
>         r = amdgpu_ring_alloc(ring, 16);
>         if (r) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> index fbf7b412..ab447e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> @@ -165,6 +165,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
>         unsigned i;
>         int r;
>
> +       if (amdgpu_sriov_vf(adev))
> +               return 0;
> +
>         r = amdgpu_ring_alloc(ring, 16);
>         if (r) {
>                 DRM_ERROR("amdgpu: uvd enc failed to lock ring %d (%d).\n",
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx