drm/amd/pp: Expose the smu support for SDMA PG cntl
Subsystems (2)
PATCH 1/3 drm/amd/pp: Expose the smu support for SDMA PG cntl
SDMA IP can be power up/down via smu message
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 18 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 ++++++++ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + 3 files changed, 27 insertions(+)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +18 -0
@@ -1224,6 +1224,21 @@ static void pp_dpm_powergate_acp(void *handle, bool gate) hwmgr->hwmgr_func->powergate_acp (hwmgr, gate); } +static void pp_dpm_powergate_sdma (void *handle,bool gate) +{ +struct pp_hwmgr *hwmgr = handle; + +if (!hwmgr) +return ; + +if (hwmgr->hwmgr_func->powergate_sdma ==NULL ) { +pr_info ("%s was not implemented.\n" , __func__); +return ; + } + + hwmgr->hwmgr_func->powergate_sdma (hwmgr, gate); +} +static int pp_set_powergating_by_smu (void *handle,uint32_t block_type,bool gate) {
@@ -1246,6 +1261,9 @@ static int pp_set_powergating_by_smu(void *handle,case AMD_IP_BLOCK_TYPE_ACP :pp_dpm_powergate_acp (handle, gate);break ; +case AMD_IP_BLOCK_TYPE_SDMA : +pp_dpm_powergate_sdma (handle, gate); +break ;default :break ; }
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +8 -0
@@ -1153,6 +1153,14 @@ static int smu10_powergate_mmhub(struct pp_hwmgr *hwmgr)return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerGateMmHub); } +static int smu10_powergate_sdma (struct pp_hwmgr *hwmgr,bool gate) +{ +if (gate) +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerDownSdma); +else +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerUpSdma); +} +static void smu10_powergate_vcn (struct pp_hwmgr *hwmgr,bool bgate) {if (bgate) {
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -0
@@ -328,6 +328,7 @@ struct pp_hwmgr_func {int (*set_power_limit)(struct pp_hwmgr *hwmgr,uint32_t n);int (*powergate_mmhub)(struct pp_hwmgr *hwmgr);int (*smus_notify_pwe)(struct pp_hwmgr *hwmgr); +int (*powergate_sdma)(struct pp_hwmgr *hwmgr,bool bgate); };struct pp_table_func {
Signature · 6 lines
1.9.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): 1537882377-4763-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu: Move out power up/down sdma out of smu
smu only expose interface to other ip blocks.
in order to reduce dependence between smu and other ip blocks
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 ++++++ drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 15 --------------- 3 files changed, 7 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +6 -0
@@ -1364,6 +1364,9 @@ static int sdma_v4_0_hw_init(void *handle)int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +if (adev->asic_type ==CHIP_RAVEN && adev->powerplay.pp_funcs->set_powergating_by_smu) +amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_SDMA , false); +sdma_v4_0_init_golden_registers (adev); r =sdma_v4_0_start (adev);
@@ -1381,6 +1384,9 @@ static int sdma_v4_0_hw_fini(void *handle)sdma_v4_0_ctx_switch_enable (adev, false);sdma_v4_0_enable (adev, false); +if (adev->asic_type ==CHIP_RAVEN && adev->powerplay.pp_funcs->set_powergating_by_smu) +amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_SDMA , true); +return 0 ; }
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +1 -0
@@ -1216,6 +1216,7 @@ static void smu10_powergate_vcn(struct pp_hwmgr *hwmgr, bool bgate) .smus_notify_pwe = smu10_smus_notify_pwe, .display_clock_voltage_request = smu10_display_clock_voltage_request, .powergate_gfx = smu10_gfx_off_control, + .powergate_sdma = smu10_powergate_sdma, };int smu10_init_function_pointers (struct pp_hwmgr *hwmgr)
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +0 -15
@@ -186,19 +186,6 @@ static int smu10_verify_smc_interface(struct pp_hwmgr *hwmgr)return 0 ; } -/* sdma is disabled by default in vbios, need to re-enable in driver */ -static void smu10_smc_enable_sdma (struct pp_hwmgr *hwmgr) -{ -smu10_send_msg_to_smc (hwmgr, - PPSMC_MSG_PowerUpSdma); -} - -static void smu10_smc_disable_sdma (struct pp_hwmgr *hwmgr) -{ -smu10_send_msg_to_smc (hwmgr, - PPSMC_MSG_PowerDownSdma); -} -/* vcn is disabled by default in vbios, need to re-enable in driver */ static void smu10_smc_enable_vcn (struct pp_hwmgr *hwmgr) {
@@ -218,7 +205,6 @@ static int smu10_smu_fini(struct pp_hwmgr *hwmgr) (struct smu10_smumgr *)(hwmgr->smu_backend);if (priv) { -smu10_smc_disable_sdma (hwmgr);smu10_smc_disable_vcn (hwmgr); amdgpu_bo_free_kernel(&priv->smu_tables.entry[SMU10_WMTABLE].handle, &priv->smu_tables.entry[SMU10_WMTABLE].mc_addr,
@@ -243,7 +229,6 @@ static int smu10_start_smu(struct pp_hwmgr *hwmgr)if (smu10_verify_smc_interface (hwmgr))return -EINVAL ; -smu10_smc_enable_sdma (hwmgr);smu10_smc_enable_vcn (hwmgr);return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/pp: Remove uncessary extra vcn pg cntl in smu
In reply to a message not in the archivethe vcn power will be controlled by VCN.
--- drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +1 -15
@@ -186,26 +186,12 @@ static int smu10_verify_smc_interface(struct pp_hwmgr *hwmgr)return 0 ; } -/* vcn is disabled by default in vbios, need to re-enable in driver */ -static void smu10_smc_enable_vcn (struct pp_hwmgr *hwmgr) -{ -smu10_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_PowerUpVcn,0 ); -} - -static void smu10_smc_disable_vcn (struct pp_hwmgr *hwmgr) -{ -smu10_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_PowerDownVcn,0 ); -} -static int smu10_smu_fini (struct pp_hwmgr *hwmgr) {struct smu10_smumgr *priv = (struct smu10_smumgr *)(hwmgr->smu_backend);if (priv) { -smu10_smc_disable_vcn (hwmgr);amdgpu_bo_free_kernel (&priv->smu_tables.entry[SMU10_WMTABLE ].handle, &priv->smu_tables.entry[SMU10_WMTABLE ].mc_addr, &priv->smu_tables.entry[SMU10_WMTABLE ].table);
@@ -229,7 +215,7 @@ static int smu10_start_smu(struct pp_hwmgr *hwmgr)if (smu10_verify_smc_interface (hwmgr))return -EINVAL ; -smu10_smc_enable_vcn (hwmgr); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byPatch 1, 2:
Patch 3 make raven2 hang during load vcn ucode.
Thanks,
Ray
Quoted 83 lines · Rex Zhu
SDMA IP can be power up/down via smu message
Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 18 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 ++++++++ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + 3 files changed, 27 insertions(+)drivers/gpu/drm/amd/powerplay/amd_powerplay.c +18
-0@@ -1224,6 +1224,21 @@ static void pp_dpm_powergate_acp(void *handle, bool gate) hwmgr->hwmgr_func->powergate_acp (hwmgr, gate); } +static void pp_dpm_powergate_sdma (void *handle,bool gate) +{ +struct pp_hwmgr *hwmgr = handle; + +if (!hwmgr) +return ; + +if (hwmgr->hwmgr_func->powergate_sdma ==NULL ) { +pr_info ("%s was not implemented.\n" , __func__); +return ; + } + + hwmgr->hwmgr_func->powergate_sdma (hwmgr, gate); +} +static int pp_set_powergating_by_smu (void *handle,uint32_t block_type,bool gate) {@@ -1246,6 +1261,9 @@ static int pp_set_powergating_by_smu(void *handle,case AMD_IP_BLOCK_TYPE_ACP :pp_dpm_powergate_acp (handle, gate);break ; +case AMD_IP_BLOCK_TYPE_SDMA : +pp_dpm_powergate_sdma (handle, gate); +break ;default :break ; }drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +8
-0@@ -1153,6 +1153,14 @@ static int smu10_powergate_mmhub(struct pp_hwmgr *hwmgr)return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerGateMmHub); } +static int smu10_powergate_sdma (struct pp_hwmgr *hwmgr,bool gate) +{ +if (gate) +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerDownSdma); +else +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerUpSdma); +} +static void smu10_powergate_vcn (struct pp_hwmgr *hwmgr,bool bgate) {if (bgate) {drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1
-0@@ -328,6 +328,7 @@ struct pp_hwmgr_func {int (*set_power_limit)(struct pp_hwmgr *hwmgr,uint32_t n);int (*powergate_mmhub)(struct pp_hwmgr *hwmgr);int (*smus_notify_pwe)(struct pp_hwmgr *hwmgr); +int (*powergate_sdma)(struct pp_hwmgr *hwmgr,bool bgate); };struct pp_table_func {Signature · 6 lines
1.9.1 _______________________________________________ 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