[PATCH] drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Tom St Denis
> Sent: Tuesday, October 24, 2017 12:08 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: StDenis, Tom
> Subject: [PATCH] drm/amd/amdgpu: Remove workaround for
> suspend/resume in uvd7
> 
> The workaround is not required anymor and would result in
> hangs during suspend/resume cycles if the uvd block were busy.
> 
> 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_v7_0.c | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> index 8dbb409b20be..762ff3901a7a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> @@ -592,11 +592,7 @@ static int uvd_v7_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_v7_0_resume(void *handle)
> @@ -604,12 +600,10 @@ static int uvd_v7_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_v7_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