drm/amdgpu: Allow switching to CUSTOM profile on Vega10
Subsystems (2)
PATCH 1/2 drm/amdgpu: Allow switching to CUSTOM profile on Vega10
Don't return an error if the CUSTOM profile is selected, just apply it with the values saved to the GPU. But ensure that we zero out the copy stored in adev to ensure that a valid profile has been submitted at some point first
--- .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +22 -1
@@ -1427,6 +1427,15 @@ static int vega10_setup_default_dpm_tables(struct pp_hwmgr *hwmgr)vega10_setup_default_pcie_table (hwmgr); +/* Zero out the saved copy of the CUSTOM profile +* This will be checked when trying to set the profile +* and will require that new values be passed in +*/ + data->custom_profile_mode[0 ] =0 ; + data->custom_profile_mode[1 ] =0 ; + data->custom_profile_mode[2 ] =0 ; + data->custom_profile_mode[3 ] =0 ; +/* save a copy of the default DPM table */ memcpy (&(data->golden_dpm_table), &(data->dpm_table),sizeof (struct vega10_dpm_table ));
@@ -4910,9 +4919,20 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui 1 << power_profile_mode);if (power_profile_mode ==PP_SMC_POWER_PROFILE_CUSTOM ) { -if (size ==0 || size >4 ) +if (size !=0 && size !=4 )return -EINVAL ; +/* If size = 0 and the CUSTOM profile has been set already +* (check BUSY_SET_POINT since that is always >0 for a valid +* profile) then just apply the profile. +*/ +if (size ==0 ) { +if (data->custom_profile_mode[0 ] !=0 ) + goto out; +else +return -EINVAL ; + } + data->custom_profile_mode[0 ] = busy_set_point = input[0 ]; data->custom_profile_mode[1 ] =FPS = input[1 ]; data->custom_profile_mode[2 ] = use_rlc_busy = input[2 ];
@@ -4923,6 +4943,7 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui use_rlc_busy << 16 | min_active_level<<24); } +out: hwmgr->power_profile_mode = power_profile_mode;return 0 ;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amdgpu: Allow switching to CUSTOM profile on Vega20
Vega20 stores a CUSTOM profile on the GPU, but it may not be valid. Add a bool to vega20_hwmgr to determine whether or not a valid CUSTOM profile has been set, and use that to check when a user requests switching to the CUSTOM profile without passing in any arguments. Then if the CUSTOM profile has been set already, we can switch to it without providing the parameters again
--- .../gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 16 +++++++++++++++- .../gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +15 -1
@@ -434,6 +434,7 @@ static int vega20_hwmgr_backend_init(struct pp_hwmgr *hwmgr) hwmgr->platform_descriptor.clockStep.memoryClock =500 ; data->total_active_cus = adev->gfx.cu_info.number; + data->is_custom_profile_set = false;return 0 ; }
@@ -3843,7 +3844,11 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui }if (power_profile_mode ==PP_SMC_POWER_PROFILE_CUSTOM ) { -if (size <10 ) +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +if (size ==0 && !data->is_custom_profile_set) +return -EINVAL ; +if (size <10 && size !=0 )return -EINVAL ; result = vega20_get_activity_monitor_coeff(hwmgr,
@@ -3853,6 +3858,13 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui"[SetPowerProfile] Failed to get activity monitor!" , return result); +/* If size==0, then we want to apply the already-configured +* CUSTOM profile again. Just apply it, since we checked its +* validity above +*/ +if (size ==0 ) + goto out; +switch (input[0 ]) {case 0 :/* Gfxclk */ activity_monitor.Gfx_FPS = input[1 ];
@@ -3903,11 +3915,13 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui result =vega20_set_activity_monitor_coeff (hwmgr, (uint8_t *)(&activity_monitor),WORKLOAD_PPLIB_CUSTOM_BIT ); + data->is_custom_profile_set = true;PP_ASSERT_WITH_CODE (!result,"[SetPowerProfile] Failed to set activity monitor!" , return result); } +out:/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */ workload_type =conv_power_profile_to_pplib_workload (power_profile_mode);
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h +2 -0
@@ -531,6 +531,8 @@ struct vega20_hwmgr {bool pcie_parameters_override;uint32_t pcie_gen_level1;uint32_t pcie_width_level1; + +bool is_custom_profile_set; };#define VEGA20_DPM2_NEAR_TDP_DEC 10
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx