drm/amd/powerplay: add profile mode for vega10.
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: add profile mode for vega10.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 130 +++++++++++++++++---- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 4 + 2 files changed, 109 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +105 -25
@@ -77,6 +77,8 @@#define DF_CS_AON0_DramBaseAddress0__IntLvNumChan_MASK 0x000000F0L#define DF_CS_AON0_DramBaseAddress0__IntLvAddrSel_MASK 0x00000700L#define DF_CS_AON0_DramBaseAddress0__DramBaseAddr_MASK 0xFFFFF000L +static int vega10_force_clock_level (struct pp_hwmgr *hwmgr, +enum pp_clock_type type,uint32_t mask);const ULONG PhwVega10_Magic = (ULONG )(PHM_VIslands_Magic);
@@ -4223,34 +4225,30 @@ static int vega10_unforce_dpm_levels(struct pp_hwmgr *hwmgr)return 0 ; } -static int vega10_dpm_force_dpm_level (struct pp_hwmgr *hwmgr, -enum amd_dpm_forced_level level) +static int vega10_get_profiling_clk_mask (struct pp_hwmgr *hwmgr,enum amd_dpm_forced_level level, +uint32_t *sclk_mask,uint32_t *mclk_mask,uint32_t *soc_mask) { -int ret =0 ; +struct phm_ppt_v2_information *table_info = + (struct phm_ppt_v2_information *)(hwmgr->pptable); -switch (level) { -case AMD_DPM_FORCED_LEVEL_HIGH : - ret =vega10_force_dpm_highest (hwmgr); -if (ret) -return ret; -break ; -case AMD_DPM_FORCED_LEVEL_LOW : - ret =vega10_force_dpm_lowest (hwmgr); -if (ret) -return ret; -break ; -case AMD_DPM_FORCED_LEVEL_AUTO : - ret =vega10_unforce_dpm_levels (hwmgr); -if (ret) -return ret; -break ; -default : -break ; +if (table_info->vdd_dep_on_sclk->count >VEGA10_UMD_PSTATE_GFXCLK_LEVEL && + table_info->vdd_dep_on_socclk->count >VEGA10_UMD_PSTATE_SOCCLK_LEVEL && + table_info->vdd_dep_on_mclk->count >VEGA10_UMD_PSTATE_MCLK_LEVEL ) { + *sclk_mask =VEGA10_UMD_PSTATE_GFXCLK_LEVEL ; + *soc_mask =VEGA10_UMD_PSTATE_SOCCLK_LEVEL ; + *mclk_mask =VEGA10_UMD_PSTATE_MCLK_LEVEL ; } - hwmgr->dpm_level = level; - -return ret; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) { + *sclk_mask =0 ; + }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) { + *mclk_mask =0 ; + }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + *sclk_mask = table_info->vdd_dep_on_sclk->count -1 ; + *soc_mask = table_info->vdd_dep_on_socclk->count -1 ; + *mclk_mask = table_info->vdd_dep_on_mclk->count -1 ; + } +return 0 ; }static int vega10_set_fan_control_mode (struct pp_hwmgr *hwmgr,uint32_t mode)
@@ -4277,6 +4275,86 @@ static int vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)return result; } +static int vega10_dpm_force_dpm_level (struct pp_hwmgr *hwmgr, +enum amd_dpm_forced_level level) +{ +int ret =0 ; +uint32_t sclk_mask =0 ; +uint32_t mclk_mask =0 ; +uint32_t soc_mask =0 ; +uint32_t profile_mode_mask =AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD | +AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK | +AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | +AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ; + +if (level == hwmgr->dpm_level) +return ret; + +if (!(hwmgr->dpm_level & profile_mode_mask)) { +/* enter profile mode, save current level, disable gfx cg*/ +if (level & profile_mode_mask) { + hwmgr->saved_dpm_level = hwmgr->dpm_level; +cgs_set_clockgating_state (hwmgr->device, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_UNGATE ); + } + }else { +/* exit profile mode, restore level, enable gfx cg*/ +if (!(level & profile_mode_mask)) { +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT ) + level = hwmgr->saved_dpm_level; +cgs_set_clockgating_state (hwmgr->device, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_GATE ); + } + } + +switch (level) { +case AMD_DPM_FORCED_LEVEL_HIGH : + ret =vega10_force_dpm_highest (hwmgr); +if (ret) +return ret; + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_LOW : + ret =vega10_force_dpm_lowest (hwmgr); +if (ret) +return ret; + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_AUTO : + ret =vega10_unforce_dpm_levels (hwmgr); +if (ret) +return ret; + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD : +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK : +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK : +case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : + ret =vega10_get_profiling_clk_mask (hwmgr, level, &sclk_mask, &mclk_mask, &soc_mask); +if (ret) +return ret; + hwmgr->dpm_level = level; +vega10_force_clock_level (hwmgr,PP_SCLK ,1 <<sclk_mask); +vega10_force_clock_level (hwmgr,PP_MCLK ,1 <<mclk_mask); +break ; +case AMD_DPM_FORCED_LEVEL_MANUAL : + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT : +default : +break ; + } + +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->saved_dpm_level !=AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +vega10_set_fan_control_mode (hwmgr,AMD_FAN_CTRL_NONE ); +else if (level !=AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->saved_dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +vega10_set_fan_control_mode (hwmgr,AMD_FAN_CTRL_AUTO ); + +return 0 ; +} +static int vega10_get_fan_control_mode (struct pp_hwmgr *hwmgr) {struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr->backend);
@@ -4522,7 +4600,9 @@ static int vega10_force_clock_level(struct pp_hwmgr *hwmgr,struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr->backend);int i; -if (hwmgr->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL ) +if (hwmgr->dpm_level & (AMD_DPM_FORCED_LEVEL_AUTO | +AMD_DPM_FORCED_LEVEL_LOW | +AMD_DPM_FORCED_LEVEL_HIGH ))return -EINVAL ;switch (type) {
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +4 -0
@@ -434,6 +434,10 @@ struct vega10_hwmgr {#define PPVEGA10_VEGA10UCLKCLKAVERAGEALPHA_DFLT 25/* 10% * 255 = 25 */ #define PPVEGA10_VEGA10GFXACTIVITYAVERAGEALPHA_DFLT 25/* 10% * 255 = 25 */ +#define VEGA10_UMD_PSTATE_GFXCLK_LEVEL 0x3 +#define VEGA10_UMD_PSTATE_SOCCLK_LEVEL 0x3 +#define VEGA10_UMD_PSTATE_MCLK_LEVEL 0x2 +extern int tonga_initializa_dynamic_state_adjustment_rule_settings (struct pp_hwmgr *hwmgr);extern int tonga_hwmgr_backend_fini (struct pp_hwmgr *hwmgr);extern int tonga_get_mc_microcode_version (struct pp_hwmgr *hwmgr);
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): 1499859004-7548-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Wednesday, July 12, 2017 7:30 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: add profile mode for vega10.Change-Id I9d69d4fc503acf458b62bf2b79dc839e8b0df5a1Signed-off-by Rex Zhu <[email protected]>
Quoted 221 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 130 +++++++++++++++++---- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 4 + 2 files changed, 109 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-0@@ -77,6 +77,8 @@#define DF_CS_AON0_DramBaseAddress0__IntLvNumChan_MASK
0x000000F0L
#defineDF_CS_AON0_DramBaseAddress0__IntLvAddrSel_MASK0x00000700L
#defineDF_CS_AON0_DramBaseAddress0__DramBaseAddr_MASK0xFFFFF000Ldrivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +7
-21+static int vega10_force_clock_level (struct pp_hwmgr *hwmgr, +enum pp_clock_type type,uint32_t mask);const ULONG PhwVega10_Magic = (ULONG )(PHM_VIslands_Magic);@@ -4223,34 +4225,30 @@ static int vega10_unforce_dpm_levels(struct pp_hwmgr *hwmgr)return 0 ; } -static int vega10_dpm_force_dpm_level (struct pp_hwmgr *hwmgr, -enum amd_dpm_forced_level level) +static int vega10_get_profiling_clk_mask (struct pp_hwmgr *hwmgr,enum amd_dpm_forced_level level, +uint32_t *sclk_mask,uint32_t *mclk_mask,uint32_t *soc_mask) { -int ret =0 ; +struct phm_ppt_v2_information *table_info = + (struct phm_ppt_v2_information *)(hwmgr- >pptable); -switch (level) { -case AMD_DPM_FORCED_LEVEL_HIGH : - ret =vega10_force_dpm_highest (hwmgr); -if (ret) -return ret; -break ; -case AMD_DPM_FORCED_LEVEL_LOW : - ret =vega10_force_dpm_lowest (hwmgr); -if (ret) -return ret; -break ; -case AMD_DPM_FORCED_LEVEL_AUTO : - ret =vega10_unforce_dpm_levels (hwmgr); -if (ret) -return ret; -break ; -default : -break ; + if (table_info->vdd_dep_on_sclk->count >
VEGA10_UMD_PSTATE_GFXCLK_LEVEL&&drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1
-0+ table_info->vdd_dep_on_socclk->count >
VEGA10_UMD_PSTATE_SOCCLK_LEVEL&&drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1
-0+ table_info->vdd_dep_on_mclk->count >
VEGA10_UMD_PSTATE_MCLK_LEVEL) {drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +13
-3+ *sclk_mask =VEGA10_UMD_PSTATE_GFXCLK_LEVEL ; + *soc_mask =VEGA10_UMD_PSTATE_SOCCLK_LEVEL ; + *mclk_mask =VEGA10_UMD_PSTATE_MCLK_LEVEL ; } - hwmgr->dpm_level = level; - -return ret; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) { + *sclk_mask =0 ; + }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) { + *mclk_mask =0 ; + }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + *sclk_mask = table_info->vdd_dep_on_sclk->count -1 ; + *soc_mask = table_info->vdd_dep_on_socclk->count -1 ; + *mclk_mask = table_info->vdd_dep_on_mclk->count -1 ; + } +return 0 ; } static int vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr,
uint32_tmode)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +8
-0@@ -4277,6 +4275,86 @@ static int vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode) return result; } +static int vega10_dpm_force_dpm_level (struct pp_hwmgr *hwmgr, +enum amd_dpm_forced_level level) +{ +int ret =0 ; +uint32_t sclk_mask =0 ; +uint32_t mclk_mask =0 ; +uint32_t soc_mask =0 ; + uint32_t profile_mode_mask =
AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD|
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK|
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK|
+AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +16
-0+ +if (level == hwmgr->dpm_level) +return ret; + +if (!(hwmgr->dpm_level & profile_mode_mask)) { +/* enter profile mode, save current level, disable gfx cg*/ +if (level & profile_mode_mask) { + hwmgr->saved_dpm_level = hwmgr->dpm_level; +cgs_set_clockgating_state (hwmgr->device, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_UNGATE ); + } + }else { +/* exit profile mode, restore level, enable gfx cg*/ +if (!(level & profile_mode_mask)) { + if (level ==
AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +31
-0+ level = hwmgr->saved_dpm_level; +cgs_set_clockgating_state (hwmgr->device, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_GATE ); + } + } + +switch (level) { +case AMD_DPM_FORCED_LEVEL_HIGH : + ret =vega10_force_dpm_highest (hwmgr); +if (ret) +return ret; + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_LOW : + ret =vega10_force_dpm_lowest (hwmgr); +if (ret) +return ret; + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_AUTO : + ret =vega10_unforce_dpm_levels (hwmgr); +if (ret) +return ret; + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD : +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK : +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK : +case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : + ret = vega10_get_profiling_clk_mask(hwmgr, level,
&sclk_mask,&mclk_mask,&soc_mask);drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +5
-0+if (ret) +return ret; + hwmgr->dpm_level = level; +vega10_force_clock_level (hwmgr,PP_SCLK ,1 <<sclk_mask); + vega10_force_clock_level(hwmgr, PP_MCLK,1<<mclk_mask);
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +10
-0+break ; +case AMD_DPM_FORCED_LEVEL_MANUAL : + hwmgr->dpm_level = level; +break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT : +default : +break ; + } + + if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr-Quoted 1 line
saved_dpm_level!=AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1
-0+ vega10_set_fan_control_mode(hwmgr,
AMD_FAN_CTRL_NONE);drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1
-0+ else if (level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK &&
hwmgr->saved_dpm_level==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1
-0+ vega10_set_fan_control_mode(hwmgr,
AMD_FAN_CTRL_AUTO);drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +4
-0+ +return 0 ; +} +static int vega10_get_fan_control_mode (struct pp_hwmgr *hwmgr) { struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr-Quoted 1 line
backend);
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +3
-1@@ -4522,7 +4600,9 @@ static int vega10_force_clock_level(structpp_hwmgr *hwmgr, struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr- >backend);int i; -if (hwmgr->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL ) +if (hwmgr->dpm_level & (AMD_DPM_FORCED_LEVEL_AUTO | +AMD_DPM_FORCED_LEVEL_LOW | +AMD_DPM_FORCED_LEVEL_HIGH ))return -EINVAL ;drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-0switch (type) {drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +0
-0@@ -434,6 +434,10 @@ struct vega10_hwmgr {#define PPVEGA10_VEGA10UCLKCLKAVERAGEALPHA_DFLT 25/* 10% * 255 = 25 */
#definePPVEGA10_VEGA10GFXACTIVITYAVERAGEALPHA_DFLT25 /* 10% *
255 = 25 */drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +4
-0+#define VEGA10_UMD_PSTATE_GFXCLK_LEVEL 0x3 +#define VEGA10_UMD_PSTATE_SOCCLK_LEVEL 0x3 +#define VEGA10_UMD_PSTATE_MCLK_LEVEL 0x2 + extern int tonga_initializa_dynamic_state_adjustment_rule_settings(struct
pp_hwmgr*hwmgr);
extern inttonga_hwmgr_backend_fini(struct pp_hwmgr *hwmgr); extern inttonga_get_mc_microcode_version(structpp_hwmgr*hwmgr);
--
1.9.1
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