[PATCH] drm/amd/amdgpu: Remove workaround check for UVD6 on APUs

[Alex Deucher]

On Mon, Oct 23, 2017 at 1:03 PM, Tom St Denis <tom.stdenis at amd.com> wrote:
> On APUs the uvd6 driver was skipping proper suspend/resume routines resulting
> in a broken state upon resume.
>
> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>

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

> ---
>  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 71299c67c517..2581543b35a7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -565,11 +565,7 @@ static int uvd_v6_0_suspend(void *handle)
>         if (r)
>                 return r;
>
> -       /* Skip this for APU for now */
> -       if (!(adev->flags & AMD_IS_APU))
> -               r = amdgpu_uvd_suspend(adev);
> -
> -       return r;
> +       return amdgpu_uvd_suspend(adev);
>  }
>
>  static int uvd_v6_0_resume(void *handle)
> @@ -577,12 +573,10 @@ static int uvd_v6_0_resume(void *handle)
>         int r;
>         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>
> -       /* Skip this for APU for now */
> -       if (!(adev->flags & AMD_IS_APU)) {
> -               r = amdgpu_uvd_resume(adev);
> -               if (r)
> -                       return r;
> -       }
> +       r = amdgpu_uvd_resume(adev);
> +       if (r)
> +               return r;
> +
>         return uvd_v6_0_hw_init(adev);
>  }
>
> --
> 2.12.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx