Skip to content

L
linux
Commit b89e9eb6 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files
Options

drm/amd/powerplay: optimize amdgpu_dpm_set_clockgating_by_smu() implementation 

Cover the implementation details from outside(of power part).
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 171090db
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
View file @ b89e9eb6
...@@ -1232,3 +1232,18 @@ int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev) ...@@ -1232,3 +1232,18 @@ int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev)
return ret; return ret;
} }
int amdgpu_dpm_set_clockgating_by_smu(struct amdgpu_device *adev,
uint32_t msg_id)
{
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->set_clockgating_by_smu)
ret = pp_funcs->set_clockgating_by_smu(pp_handle,
msg_id);
return ret;
}
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
View file @ b89e9eb6
...@@ -341,10 +341,6 @@ enum amdgpu_pcie_gen { ...@@ -341,10 +341,6 @@ enum amdgpu_pcie_gen {
((adev)->powerplay.pp_funcs->reset_power_profile_state(\ ((adev)->powerplay.pp_funcs->reset_power_profile_state(\
(adev)->powerplay.pp_handle, request)) (adev)->powerplay.pp_handle, request))
#define amdgpu_dpm_set_clockgating_by_smu(adev, msg_id) \
((adev)->powerplay.pp_funcs->set_clockgating_by_smu(\
(adev)->powerplay.pp_handle, msg_id))
#define amdgpu_dpm_get_power_profile_mode(adev, buf) \ #define amdgpu_dpm_get_power_profile_mode(adev, buf) \
((adev)->powerplay.pp_funcs->get_power_profile_mode(\ ((adev)->powerplay.pp_funcs->get_power_profile_mode(\
(adev)->powerplay.pp_handle, buf)) (adev)->powerplay.pp_handle, buf))
...@@ -546,4 +542,7 @@ int amdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en); ...@@ -546,4 +542,7 @@ int amdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en);
int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev); int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev);
int amdgpu_dpm_set_clockgating_by_smu(struct amdgpu_device *adev,
uint32_t msg_id);
#endif #endif
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
View file @ b89e9eb6
...@@ -5880,8 +5880,7 @@ static int gfx_v8_0_tonga_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -5880,8 +5880,7 @@ static int gfx_v8_0_tonga_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_CG, PP_BLOCK_GFX_CG,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & (AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_GFX_MGLS)) { if (adev->cg_flags & (AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_GFX_MGLS)) {
...@@ -5902,8 +5901,7 @@ static int gfx_v8_0_tonga_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -5902,8 +5901,7 @@ static int gfx_v8_0_tonga_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_MG, PP_BLOCK_GFX_MG,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
return 0; return 0;
...@@ -5932,8 +5930,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -5932,8 +5930,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_CG, PP_BLOCK_GFX_CG,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & (AMD_CG_SUPPORT_GFX_3D_CGCG | AMD_CG_SUPPORT_GFX_3D_CGLS)) { if (adev->cg_flags & (AMD_CG_SUPPORT_GFX_3D_CGCG | AMD_CG_SUPPORT_GFX_3D_CGLS)) {
...@@ -5952,8 +5949,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -5952,8 +5949,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_3D, PP_BLOCK_GFX_3D,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & (AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_GFX_MGLS)) { if (adev->cg_flags & (AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_GFX_MGLS)) {
...@@ -5974,8 +5970,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -5974,8 +5970,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_MG, PP_BLOCK_GFX_MG,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & AMD_CG_SUPPORT_GFX_RLC_LS) { if (adev->cg_flags & AMD_CG_SUPPORT_GFX_RLC_LS) {
...@@ -5990,8 +5985,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -5990,8 +5985,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_RLC, PP_BLOCK_GFX_RLC,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & AMD_CG_SUPPORT_GFX_CP_LS) { if (adev->cg_flags & AMD_CG_SUPPORT_GFX_CP_LS) {
...@@ -6005,8 +5999,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev, ...@@ -6005,8 +5999,7 @@ static int gfx_v8_0_polaris_update_gfx_clock_gating(struct amdgpu_device *adev,
PP_BLOCK_GFX_CP, PP_BLOCK_GFX_CP,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
return 0; return 0;
......
drivers/gpu/drm/amd/amdgpu/vi.c
View file @ b89e9eb6
...@@ -1507,8 +1507,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1507,8 +1507,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_MC, PP_BLOCK_SYS_MC,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & (AMD_CG_SUPPORT_SDMA_LS | AMD_CG_SUPPORT_SDMA_MGCG)) { if (adev->cg_flags & (AMD_CG_SUPPORT_SDMA_LS | AMD_CG_SUPPORT_SDMA_MGCG)) {
...@@ -1526,8 +1525,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1526,8 +1525,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_SDMA, PP_BLOCK_SYS_SDMA,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & (AMD_CG_SUPPORT_HDP_LS | AMD_CG_SUPPORT_HDP_MGCG)) { if (adev->cg_flags & (AMD_CG_SUPPORT_HDP_LS | AMD_CG_SUPPORT_HDP_MGCG)) {
...@@ -1545,8 +1543,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1545,8 +1543,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_HDP, PP_BLOCK_SYS_HDP,
pp_support_state, pp_support_state,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
...@@ -1560,8 +1557,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1560,8 +1557,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_BIF, PP_BLOCK_SYS_BIF,
PP_STATE_SUPPORT_LS, PP_STATE_SUPPORT_LS,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & AMD_CG_SUPPORT_BIF_MGCG) { if (adev->cg_flags & AMD_CG_SUPPORT_BIF_MGCG) {
if (state == AMD_CG_STATE_UNGATE) if (state == AMD_CG_STATE_UNGATE)
...@@ -1573,8 +1569,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1573,8 +1569,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_BIF, PP_BLOCK_SYS_BIF,
PP_STATE_SUPPORT_CG, PP_STATE_SUPPORT_CG,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & AMD_CG_SUPPORT_DRM_LS) { if (adev->cg_flags & AMD_CG_SUPPORT_DRM_LS) {
...@@ -1588,8 +1583,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1588,8 +1583,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_DRM, PP_BLOCK_SYS_DRM,
PP_STATE_SUPPORT_LS, PP_STATE_SUPPORT_LS,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
if (adev->cg_flags & AMD_CG_SUPPORT_ROM_MGCG) { if (adev->cg_flags & AMD_CG_SUPPORT_ROM_MGCG) {
...@@ -1603,8 +1597,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle, ...@@ -1603,8 +1597,7 @@ static int vi_common_set_clockgating_state_by_smu(void *handle,
PP_BLOCK_SYS_ROM, PP_BLOCK_SYS_ROM,
PP_STATE_SUPPORT_CG, PP_STATE_SUPPORT_CG,
pp_state); pp_state);
if (adev->powerplay.pp_funcs->set_clockgating_by_smu) amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
amdgpu_dpm_set_clockgating_by_smu(adev, msg_id);
} }
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7