[PATCH 2/2] drm/amdgpu: reconfigure spm golden settings on Navi1x after GFXOFF exit

[Luben Tuikov]

On 2020-07-28 1:27 a.m., Tianci Yin wrote:
> From: "Tianci.Yin" <tianci.yin at amd.com>
> 
> On Navi1x, the SPM golden settings will be lost after GFXOFF enter/exit,

" are lost "

> reconfigure the golden settings after GFXOFF exit.

" so reconfigure ..."

> 
> Change-Id: I9358ba9c65f241c36f8a35916170b19535148ee9
> Signed-off-by: Tianci.Yin <tianci.yin at amd.com>
> ---
>  drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> index 55463e7a11e2..5da0436d41e0 100644
> --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> @@ -1309,6 +1309,7 @@ static int smu_enable_umd_pstate(void *handle,
>  
>  	struct smu_context *smu = (struct smu_context*)(handle);
>  	struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
> +	struct amdgpu_device *adev = smu->adev;
>  
>  	if (!smu->is_apu && !smu_dpm_ctx->dpm_context)
>  		return -EINVAL;
> @@ -1324,6 +1325,16 @@ static int smu_enable_umd_pstate(void *handle,
>  			amdgpu_device_ip_set_clockgating_state(smu->adev,
>  							       AMD_IP_BLOCK_TYPE_GFX,
>  							       AMD_CG_STATE_UNGATE);
> +
> +			if (adev->asic_type >= CHIP_NAVI10 &&
> +			    adev->asic_type <= CHIP_NAVI12 &&
> +			    (adev->pm.pp_feature & PP_GFXOFF_MASK)) {
> +				if (adev->gfx.funcs->init_spm_golden) {
> +					dev_dbg(adev->dev,"GFXOFF exited, re-init SPM golden settings\n");

Space after comma is required.

> +					amdgpu_gfx_init_spm_golden(adev);
> +				} else
> +					dev_warn(adev->dev,"Callback init_spm_golden is NULL\n");

Space after comma is required.

Please add braces to the single statement of the "else". The reason for this
is that it complements the braces of the "if ( ) {" of the multi-line statement
and closes the block. "checkpatch" calls it "unbalanced braces".

With these three fixed, this patch is
Reviewed-by: Luben Tuikov <luben.tuikov at amd.com>

Regards,
Luben

> +			}
>  		}
>  	} else {
>  		/* exit umd pstate, restore level, enable gfx cg*/
>