[PATCH] drm/amd/amdgpu: Partially revert change to UVD v3 CG

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Tom St Denis
> Sent: Wednesday, August 03, 2016 12:47 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: StDenis, Tom
> Subject: [PATCH] drm/amd/amdgpu: Partially revert change to UVD v3 CG
> 
> Partially undo changes made by commit:
> 
> drm/amd/amdgpu: don't track state in UVD clockgating
> 
> To keep bypass even if CG flags are not set.
> 
> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>

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

> ---
>  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 391457f1eafd..c11b97f8e376 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -960,13 +960,13 @@ static int uvd_v6_0_set_clockgating_state(void
> *handle,
>  {
>  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> 
> -	if (!(adev->cg_flags & AMD_CG_SUPPORT_UVD_MGCG))
> -		return 0;
> -
>  	if (adev->asic_type == CHIP_FIJI ||
>  	    adev->asic_type == CHIP_POLARIS10)
>  		uvd_v6_set_bypass_mode(adev, state ==
> AMD_CG_STATE_GATE ? true : false);
> 
> +	if (!(adev->cg_flags & AMD_CG_SUPPORT_UVD_MGCG))
> +		return 0;
> +
>  	if (state == AMD_CG_STATE_GATE) {
>  		/* disable HW gating and enable Sw gating */
>  		uvd_v6_0_set_sw_clock_gating(adev);
> --
> 2.9.2
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx