[PATCH] drm/amdgpu: enable gfxoff for raven1 refresh

[Huang, Ray]

On Fri, Dec 13, 2019 at 11:24:00AM +0800, Zhu, Changfeng wrote:
> From: changzhu <Changfeng.Zhu at amd.com>
> 
> When smu version is larger than 0x41e2b, it will load
> raven_kicker_rlc.bin.To enable gfxoff for raven_kicker_rlc.bin,it
> needs to avoid adev->pm.pp_feature &= ~PP_GFXOFF_MASK when it loads
> raven_kicker_rlc.bin.
> 
> Change-Id: I4dffa1783c9ceb5d40df9756d821e2cd7feff84d
> Signed-off-by: changzhu <Changfeng.Zhu at amd.com>

Reviewed-by: Huang Rui <ray.huang at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index ea58d0e5be4c..68409bb7c9e0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1038,17 +1038,10 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)
>  	case CHIP_VEGA20:
>  		break;
>  	case CHIP_RAVEN:
> -		/* Disable GFXOFF on original raven.  There are combinations
> -		 * of sbios and platforms that are not stable.
> -		 */
> -		if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8))
> -			adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
> -		else if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
> -			 &&((adev->gfx.rlc_fw_version != 106 &&
> -			     adev->gfx.rlc_fw_version < 531) ||
> -			    (adev->gfx.rlc_fw_version == 53815) ||
> -			    (adev->gfx.rlc_feature_version < 1) ||
> -			    !adev->gfx.rlc.is_rlc_v2_1))
> +		if (!(adev->rev_id >= 0x8 ||
> +		      adev->pdev->device == 0x15d8) &&
> +		    (adev->pm.fw_version < 0x41e2b || /* not raven1 fresh */
> +		     !adev->gfx.rlc.is_rlc_v2_1)) /* without rlc save restore ucodes */
>  			adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
>  
>  		if (adev->pm.pp_feature & PP_GFXOFF_MASK)
> -- 
> 2.17.1
>