drm/amd/powerplay: optimize the interface for mgpu fan boost enablement
Subsystems (2)
PATCH 1/4 drm/amd/powerplay: optimize the interface for mgpu fan boost enablement
Cover the implementation details from outside(of power). Also preparing for expanding this to swSMU.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 ++---- 3 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -3
@@ -2228,9 +2228,7 @@ static int amdgpu_device_enable_mgpu_fan_boost(void) gpu_ins = &(mgpu_info.gpu_ins[i]); adev = gpu_ins->adev;if (!(adev->flags &AMD_IS_APU ) && - !gpu_ins->mgpu_fan_enabled && - adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->enable_mgpu_fan_boost) { + !gpu_ins->mgpu_fan_enabled) { ret =amdgpu_dpm_enable_mgpu_fan_boost (adev);if (ret)break ;
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +13 -0
@@ -1216,3 +1216,16 @@ int amdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en)return 0 ; } + +int amdgpu_dpm_enable_mgpu_fan_boost (struct amdgpu_device *adev) +{ +void *pp_handle = adev->powerplay.pp_handle; +const struct amd_pm_funcs *pp_funcs = + adev->powerplay.pp_funcs; +int ret =0 ; + +if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) + ret = pp_funcs->enable_mgpu_fan_boost (pp_handle); + +return ret; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +2 -4
@@ -357,10 +357,6 @@ enum amdgpu_pcie_gen { ((adev)->powerplay.pp_funcs->odn_edit_dpm_table (\ (adev)->powerplay.pp_handle, type, parameter, size)) -#define amdgpu_dpm_enable_mgpu_fan_boost (adev) \ - ((adev)->powerplay.pp_funcs->enable_mgpu_fan_boost(\ - (adev)->powerplay.pp_handle)) -#define amdgpu_dpm_get_ppfeature_status (adev, buf) \ ((adev)->powerplay.pp_funcs->get_ppfeature_status(\ (adev)->powerplay.pp_handle, (buf)))
@@ -548,4 +544,6 @@ int amdgpu_dpm_set_df_cstate(struct amdgpu_device *adev,int amdgpu_dpm_allow_xgmi_power_down (struct amdgpu_device *adev,bool en); +int amdgpu_dpm_enable_mgpu_fan_boost (struct amdgpu_device *adev); +#endif
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/4 drm/amd/powerplay: enable swSMU mgpu fan boost support
Enable mgpu fan boost feature on swSMU routines.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 5 ++++- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 17 +++++++++++++++++ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +4 -1
@@ -1222,9 +1222,12 @@ int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev)void *pp_handle = adev->powerplay.pp_handle;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +struct smu_context *smu = &adev->smu;int ret =0 ; -if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) +if (is_support_sw_smu (adev)) + ret =smu_enable_mgpu_fan_boost (smu); +else if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) ret = pp_funcs->enable_mgpu_fan_boost (pp_handle);return ret;
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +17 -0
@@ -2632,3 +2632,20 @@ ssize_t smu_sys_get_gpu_metrics(struct smu_context *smu,return size; } + +int smu_enable_mgpu_fan_boost (struct smu_context *smu) +{ +int ret =0 ; + +if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled) +return -EOPNOTSUPP ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->enable_mgpu_fan_boost) + ret = smu->ppt_funcs->enable_mgpu_fan_boost (smu); + +mutex_unlock (&smu->mutex); + +return ret; +}
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +3 -0
@@ -595,6 +595,7 @@ struct pptable_funcs {size_t (*get_pp_feature_mask)(struct smu_context *smu,char *buf);int (*set_pp_feature_mask)(struct smu_context *smu,uint64_t new_mask);ssize_t (*get_gpu_metrics)(struct smu_context *smu,void **table); +int (*enable_mgpu_fan_boost)(struct smu_context *smu); }; typedef enum {
@@ -798,5 +799,7 @@ int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value);ssize_t smu_sys_get_gpu_metrics (struct smu_context *smu,void **table); +int smu_enable_mgpu_fan_boost (struct smu_context *smu); +#endif #endif
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amd/powerplay: enable Navi1X mgpu fan boost feature
In reply to Evan QuanSupport Navi1X mgpu fan boost enablement.
--- .../drm/amd/powerplay/inc/smu_v11_0_ppsmc.h | 4 +++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h +3 -1
@@ -123,7 +123,9 @@#define PPSMC_MSG_DALDisableDummyPstateChange 0x49#define PPSMC_MSG_DALEnableDummyPstateChange 0x4A -#define PPSMC_Message_Count 0x4B +#define PPSMC_MSG_SetMGpuFanBoostLimitRpm 0x4C + +#define PPSMC_Message_Count 0x4Dtypedef uint32_t PPSMC_Result ;typedef uint32_t PPSMC_Msg ;
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +21 -0
@@ -138,6 +138,7 @@ static struct cmn2asic_msg_mapping navi10_message_map[SMU_MSG_MAX_COUNT] = {MSG_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE , PPSMC_MSG_DALEnableDummyPstateChange,0 ),MSG_MAP (GetVoltageByDpm, PPSMC_MSG_GetVoltageByDpm,0 ),MSG_MAP (GetVoltageByDpmOverdrive, PPSMC_MSG_GetVoltageByDpmOverdrive,0 ), + MSG_MAP(SetMGpuFanBoostLimitRpm, PPSMC_MSG_SetMGpuFanBoostLimitRpm, 0), }; static struct cmn2asic_mapping navi10_clk_map[SMU_CLK_COUNT] = {
@@ -2555,6 +2556,25 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_0 ); } +static int navi10_enable_mgpu_fan_boost (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t param =0 ; + +/* Navi12 does not support this */ +if (adev->asic_type ==CHIP_NAVI12 ) +return 0 ; + +if (adev->pdev->device ==0x7312 && + adev->external_rev_id ==0 ) + param =0xD188 ; + +return smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_SetMGpuFanBoostLimitRpm, + param, +NULL ); +} +static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table,
@@ -2636,6 +2656,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = navi10_get_gpu_metrics, + .enable_mgpu_fan_boost = navi10_enable_mgpu_fan_boost, };void navi10_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 3/4] drm/amd/powerplay: enable Navi1X mgpu fan boost feature
Quoted 42 lines · Evan Quan
Support Navi1X mgpu fan boost enablement.
Change-Id Iafbf07c56462120d2db578b6af45dd7f985a4cc1Signed-off-by Evan Quan <[email protected]>--- .../drm/amd/powerplay/inc/smu_v11_0_ppsmc.h | 4 +++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h +3
-1@@ -123,7 +123,9 @@#define PPSMC_MSG_DALDisableDummyPstateChange 0x49#define PPSMC_MSG_DALEnableDummyPstateChange 0x4A -#define PPSMC_Message_Count 0x4B +#define PPSMC_MSG_SetMGpuFanBoostLimitRpm 0x4C + +#define PPSMC_Message_Count 0x4Dtypedef uint32_t PPSMC_Result ;typedef uint32_t PPSMC_Msg ;drivers/gpu/drm/amd/powerplay/navi10_ppt.c +3
-0@@ -138,6 +138,7 @@ static struct cmn2asic_msg_mapping navi10_message_map[SMU_MSG_MAX_COUNT] = {MSG_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE , PPSMC_MSG_DALEnableDummyPstateChange,0 ),MSG_MAP (GetVoltageByDpm, PPSMC_MSG_GetVoltageByDpm,0 ),MSG_MAP (GetVoltageByDpmOverdrive, PPSMC_MSG_GetVoltageByDpmOverdrive,0 ), + MSG_MAP(SetMGpuFanBoostLimitRpm, PPSMC_MSG_SetMGpuFanBoostLimitRpm, 0), }; static struct cmn2asic_mapping navi10_clk_map[SMU_CLK_COUNT] = {@@ -2555,6 +2556,25 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_0 ); } +static int navi10_enable_mgpu_fan_boost (struct smu_context *smu) +{
drivers/gpu/drm/amd/powerplay/navi10_ppt.c static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, · line 2570
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +10
-0+struct amdgpu_device *adev = smu->adev; +uint32_t param =0 ; + +/* Navi12 does not support this */ +if (adev->asic_type ==CHIP_NAVI12 ) +return 0 ; + +if (adev->pdev->device ==0x7312 && + adev->external_rev_id ==0 ) + param =0xD188 ;
Can you please add a comment explaining above condition?
Apart from that, the series is Acked-by: Nirmoy Das <[email protected]>
Quoted 11 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +7
-0+ +return smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_SetMGpuFanBoostLimitRpm, + param, +NULL ); +} +static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c static const struct pptable_funcs navi10_ppt_funcs = { · line 2662
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-0@@ -2636,6 +2656,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = navi10_get_gpu_metrics, + .enable_mgpu_fan_boost = navi10_enable_mgpu_fan_boost, };void navi10_set_ppt_funcs (struct smu_context *smu)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 3/4] drm/amd/powerplay: enable Navi1X mgpu fan boost feature
In reply to Evan QuanQuoted 42 lines · Evan Quan
Support Navi1X mgpu fan boost enablement.
Change-Id Iafbf07c56462120d2db578b6af45dd7f985a4cc1Signed-off-by Evan Quan <[email protected]>--- .../drm/amd/powerplay/inc/smu_v11_0_ppsmc.h | 4 +++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h +3
-1@@ -123,7 +123,9 @@#define PPSMC_MSG_DALDisableDummyPstateChange 0x49#define PPSMC_MSG_DALEnableDummyPstateChange 0x4A -#define PPSMC_Message_Count 0x4B +#define PPSMC_MSG_SetMGpuFanBoostLimitRpm 0x4C + +#define PPSMC_Message_Count 0x4Dtypedef uint32_t PPSMC_Result ;typedef uint32_t PPSMC_Msg ;drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2
-0@@ -138,6 +138,7 @@ static struct cmn2asic_msg_mapping navi10_message_map[SMU_MSG_MAX_COUNT] = {MSG_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE , PPSMC_MSG_DALEnableDummyPstateChange,0 ),MSG_MAP (GetVoltageByDpm, PPSMC_MSG_GetVoltageByDpm,0 ),MSG_MAP (GetVoltageByDpmOverdrive, PPSMC_MSG_GetVoltageByDpmOverdrive,0 ), + MSG_MAP(SetMGpuFanBoostLimitRpm, PPSMC_MSG_SetMGpuFanBoostLimitRpm, 0), }; static struct cmn2asic_mapping navi10_clk_map[SMU_CLK_COUNT] = {@@ -2555,6 +2556,25 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_0 ); } +static int navi10_enable_mgpu_fan_boost (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, · line 2569
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +10
-0+{ +struct amdgpu_device *adev = smu->adev; +uint32_t param =0 ; + +/* Navi12 does not support this */ +if (adev->asic_type ==CHIP_NAVI12 ) +return 0 ; + +if (adev->pdev->device ==0x7312 && + adev->external_rev_id ==0 )
You want adev->pdev->revision here. With that fixed, series is:
Quoted 22 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +9
-1+ param =0xD188 ; + +return smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_SetMGpuFanBoostLimitRpm, + param, +NULL ); +} +static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table,@@ -2636,6 +2656,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = navi10_get_gpu_metrics, + .enable_mgpu_fan_boost = navi10_enable_mgpu_fan_boost, };void navi10_set_ppt_funcs (struct smu_context *smu) --2.28.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amd/powerplay: enable Sienna Cichlid mgpu fan boost feature
In reply to Evan QuanSupport Sienna Cichlid mgpu fan boost enablement.
--- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +10 -0
@@ -124,6 +124,7 @@ static struct cmn2asic_msg_mapping sienna_cichlid_message_map[SMU_MSG_MAX_COUNT]MSG_MAP (BacoAudioD3PME, PPSMC_MSG_BacoAudioD3PME,0 ),MSG_MAP (ArmD3, PPSMC_MSG_ArmD3,0 ),MSG_MAP (Mode1Reset, PPSMC_MSG_Mode1Reset,0 ), + MSG_MAP(SetMGpuFanBoostLimitRpm, PPSMC_MSG_SetMGpuFanBoostLimitRpm, 0), }; static struct cmn2asic_mapping sienna_cichlid_clk_map[SMU_CLK_COUNT] = {
@@ -2707,6 +2708,14 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_0 ); } +static int sienna_cichlid_enable_mgpu_fan_boost (struct smu_context *smu) +{ +return smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_SetMGpuFanBoostLimitRpm, +0 , +NULL ); +} +static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .get_allowed_feature_mask = sienna_cichlid_get_allowed_feature_mask, .set_default_dpm_table = sienna_cichlid_set_default_dpm_table,
@@ -2784,6 +2793,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = sienna_cichlid_get_gpu_metrics, + .enable_mgpu_fan_boost = sienna_cichlid_enable_mgpu_fan_boost, };void sienna_cichlid_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx