[PATCH 2/2] drm/amd/pm: update pcie dpm parameters before smu feature enablement

[Lazar, Lijo]

On 6/12/2025 1:31 PM, Kenneth Feng wrote:
> update pcie dpm parameters before smu feature enablement
> 
> Signed-off-by: Kenneth Feng <kenneth.feng at amd.com>
> ---
>  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 40 +++++++++++------------
>  1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index aedb209c75da..824fcc6dd32a 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -1687,26 +1687,6 @@ static int smu_smc_hw_setup(struct smu_context *smu)
>  		}
>  	}
>  
> -	ret = smu_system_features_control(smu, true);
> -	if (ret) {
> -		dev_err(adev->dev, "Failed to enable requested dpm features!\n");
> -		return ret;
> -	}
> -
> -	smu_init_xgmi_plpd_mode(smu);
> -
> -	ret = smu_feature_get_enabled_mask(smu, &features_supported);
> -	if (ret) {
> -		dev_err(adev->dev, "Failed to retrieve supported dpm features!\n");
> -		return ret;
> -	}
> -	bitmap_copy(feature->supported,
> -		    (unsigned long *)&features_supported,
> -		    feature->feature_num);
> -
> -	if (!smu_is_dpm_running(smu))
> -		dev_info(adev->dev, "dpm has been disabled\n");
> -
>  	/*
>  	 * Set initialized values (get from vbios) to dpm tables context such as
>  	 * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
> @@ -1753,6 +1733,26 @@ static int smu_smc_hw_setup(struct smu_context *smu)
>  		return ret;
>  	}

This doesn't work for all. smu_set_default_dpm_table has dependency on
feature enablement. For ex: SMU v13.0.6 expects
smu_set_default_dpm_table to be called after smu_system_features_control

Thanks,
Lijo

>  
> +	ret = smu_system_features_control(smu, true);
> +	if (ret) {
> +		dev_err(adev->dev, "Failed to enable requested dpm features!\n");
> +		return ret;
> +	}
> +
> +	smu_init_xgmi_plpd_mode(smu);
> +
> +	ret = smu_feature_get_enabled_mask(smu, &features_supported);
> +	if (ret) {
> +		dev_err(adev->dev, "Failed to retrieve supported dpm features!\n");
> +		return ret;
> +	}
> +	bitmap_copy(feature->supported,
> +		    (unsigned long *)&features_supported,
> +		    feature->feature_num);
> +
> +	if (!smu_is_dpm_running(smu))
> +		dev_info(adev->dev, "dpm has been disabled\n");
> +
>  	ret = smu_get_thermal_temperature_range(smu);
>  	if (ret) {
>  		dev_err(adev->dev, "Failed to get thermal temperature ranges!\n");