drm/amdgpu/swSMU: custom UMD pstate peak clock for navi14
Subsystems (2)
PATCH 1/1 drm/amdgpu/swSMU: custom UMD pstate peak clock for navi14
add navi14 umd pstate peak clock support.
NAVI14_UMD_PSTATE_PEAK_XT_GFXCLK 1670 MHz NAVI14_UMD_PSTATE_PEAK_XTM_GFXCLK 1448 MHz NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK 1181 MHz NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK 1717 MHz NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK 1448 MHz
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 53 ++++++++++++++++------ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 6 +++ 2 files changed, 45 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +39 -14
@@ -1467,18 +1467,47 @@ static int navi10_set_peak_clock_by_device(struct smu_context *smu)uint32_t sclk_freq =0 , uclk_freq =0 ;uint32_t uclk_level =0 ; -switch (adev->pdev->revision) { -case 0xf0 :/* XTX */ -case 0xc0 : - sclk_freq =NAVI10_PEAK_SCLK_XTX ; -break ; -case 0xf1 :/* XT */ -case 0xc1 : - sclk_freq =NAVI10_PEAK_SCLK_XT ; +switch (adev->asic_type) { +case CHIP_NAVI10 : +switch (adev->pdev->revision) { +case 0xf0 :/* XTX */ +case 0xc0 : + sclk_freq =NAVI10_PEAK_SCLK_XTX ; +break ; +case 0xf1 :/* XT */ +case 0xc1 : + sclk_freq =NAVI10_PEAK_SCLK_XT ; +break ; +default :/* XL */ + sclk_freq =NAVI10_PEAK_SCLK_XL ; +break ; + }break ; -default :/* XL */ - sclk_freq =NAVI10_PEAK_SCLK_XL ; +case CHIP_NAVI14 : +switch (adev->pdev->revision) { +case 0xc7 :/* XT */ +case 0xf4 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XT_GFXCLK ; +break ; +case 0xc1 :/* XTM */ +case 0xf2 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XTM_GFXCLK ; +break ; +case 0xc3 :/* XLM */ +case 0xf3 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK ; +break ; +case 0xc5 :/* XTX */ +case 0xf6 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK ; +break ; +default :/* XL */ + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK ; +break ; + }break ; +default : +return -EINVAL ; } ret =smu_get_dpm_level_count (smu,SMU_UCLK , &uclk_level);
@@ -1501,10 +1530,6 @@ static int navi10_set_peak_clock_by_device(struct smu_context *smu)static int navi10_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {int ret =0 ; -struct amdgpu_device *adev = smu->adev; - -if (adev->asic_type !=CHIP_NAVI10 ) -return -EINVAL ;switch (level) {case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK :
drivers/gpu/drm/amd/powerplay/navi10_ppt.h +6 -0
@@ -27,6 +27,12 @@#define NAVI10_PEAK_SCLK_XT (1755)#define NAVI10_PEAK_SCLK_XL (1625) +#define NAVI14_UMD_PSTATE_PEAK_XT_GFXCLK (1670) +#define NAVI14_UMD_PSTATE_PEAK_XTM_GFXCLK (1448) +#define NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK (1181) +#define NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK (1717) +#define NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK (1448) +extern void navi10_set_ppt_funcs (struct smu_context *smu);#endif
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]
Feng, Kenneth
Reviewed-by Kenneth Feng-----Original Message-----
From: Wang, Kevin(Yang)
Sent: Friday, October 11, 2019 8:52 AM
To: [email protected]
Cc: Feng, Kenneth <[email protected]>; Zhang, Hawking <[email protected]>; Hesik, Christopher <[email protected]>; Wang, Kevin(Yang) <[email protected]>
Subject: [PATCH] drm/amdgpu/swSMU: custom UMD pstate peak clock for navi14
add navi14 umd pstate peak clock support.
NAVI14_UMD_PSTATE_PEAK_XT_GFXCLK 1670 MHz NAVI14_UMD_PSTATE_PEAK_XTM_GFXCLK 1448 MHz NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK 1181 MHz NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK 1717 MHz NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK 1448 MHz
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 53 ++++++++++++++++------ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 6 +++ 2 files changed, 45 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +39 -10
@@ -1467,18 +1467,47 @@ static int navi10_set_peak_clock_by_device(struct smu_context *smu)uint32_t sclk_freq =0 , uclk_freq =0 ;uint32_t uclk_level =0 ; -switch (adev->pdev->revision) { -case 0xf0 :/* XTX */ -case 0xc0 : - sclk_freq =NAVI10_PEAK_SCLK_XTX ; -break ; -case 0xf1 :/* XT */ -case 0xc1 : - sclk_freq =NAVI10_PEAK_SCLK_XT ; +switch (adev->asic_type) { +case CHIP_NAVI10 : +switch (adev->pdev->revision) { +case 0xf0 :/* XTX */ +case 0xc0 : + sclk_freq =NAVI10_PEAK_SCLK_XTX ; +break ; +case 0xf1 :/* XT */ +case 0xc1 : + sclk_freq =NAVI10_PEAK_SCLK_XT ; +break ; +default :/* XL */ + sclk_freq =NAVI10_PEAK_SCLK_XL ; +break ; + }break ; -default :/* XL */ - sclk_freq =NAVI10_PEAK_SCLK_XL ; +case CHIP_NAVI14 : +switch (adev->pdev->revision) { +case 0xc7 :/* XT */ +case 0xf4 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XT_GFXCLK ; +break ; +case 0xc1 :/* XTM */ +case 0xf2 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XTM_GFXCLK ; +break ; +case 0xc3 :/* XLM */ +case 0xf3 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK ; +break ; +case 0xc5 :/* XTX */ +case 0xf6 : + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK ; +break ; +default :/* XL */ + sclk_freq =NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK ; +break ; + }break ; +default : +return -EINVAL ; } ret = smu_get_dpm_level_count(smu, SMU_UCLK, &uclk_level); @@ -1501,10 +1530,6 @@ static int navi10_set_peak_clock_by_device(struct smu_context *smu) static int navi10_set_performance_level(struct smu_context *smu, enum amd_dpm_forced_level level) {
int ret = 0;
- struct amdgpu_device *adev = smu->adev;
-
- if (adev->asic_type != CHIP_NAVI10)
- return -EINVAL;
switch (level) {
case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
drivers/gpu/drm/amd/powerplay/navi10_ppt.h +6 -0
@@ -27,6 +27,12 @@#define NAVI10_PEAK_SCLK_XT (1755)#define NAVI10_PEAK_SCLK_XL (1625) +#define NAVI14_UMD_PSTATE_PEAK_XT_GFXCLK (1670) +#define NAVI14_UMD_PSTATE_PEAK_XTM_GFXCLK (1448) +#define NAVI14_UMD_PSTATE_PEAK_XLM_GFXCLK (1181) +#define NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK (1717) +#define NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK (1448) +extern void navi10_set_ppt_funcs (struct smu_context *smu);#endif
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx