drm/amd/powerplay: expose Vega20 realtime memory utilization
Subsystems (2)
PATCH 1/3 drm/amd/powerplay: expose Vega20 realtime memory utilization
A new sysfs interface mem_busy_percent is added for telling how busy the VRAM is(in percentage).
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 40 +++++++++++++++++++ .../gpu/drm/amd/include/kgd_pp_interface.h | 1 + .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 16 +++++++- 3 files changed, 55 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +40 -0
@@ -1354,6 +1354,32 @@ static ssize_t amdgpu_get_busy_percent(struct device *dev,return snprintf (buf,PAGE_SIZE ,"%d\n" , value); } +/** +* DOC: mem_busy_percent +* +* The amdgpu driver provides a sysfs API for reading how busy the VRAM +* is as a percentage. The file mem_busy_percent is used for this. +* The SMU firmware computes a percentage of load based on the +* aggregate activity level in the IP cores. +*/ +static ssize_t amdgpu_get_memory_busy_percent (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +int r, value, size =sizeof (value); + +/* read the IP busy sensor */ + r =amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_MEM_LOAD , + (void *)&value, &size); + +if (r) +return r; + +return snprintf (buf,PAGE_SIZE ,"%d\n" , value); +} +/** * DOC: pcie_bw *
@@ -1423,6 +1449,8 @@ static DEVICE_ATTR(pp_od_clk_voltage, S_IRUGO | S_IWUSR, amdgpu_set_pp_od_clk_voltage); static DEVICE_ATTR(gpu_busy_percent, S_IRUGO, amdgpu_get_busy_percent, NULL); +static DEVICE_ATTR(mem_busy_percent, S_IRUGO, + amdgpu_get_memory_busy_percent, NULL); static DEVICE_ATTR(pcie_bw, S_IRUGO, amdgpu_get_pcie_bw, NULL); static DEVICE_ATTR(ppfeatures, S_IRUGO | S_IWUSR, amdgpu_get_ppfeature_status,
@@ -2805,6 +2833,16 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) "gpu_busy_level\n");return ret; } +/* APU does not have its own dedicated memory */ +if (!(adev->flags &AMD_IS_APU )) { + ret =device_create_file (adev->dev, + &dev_attr_mem_busy_percent); +if (ret) { +DRM_ERROR ("failed to create device file " +"mem_busy_percent\n" ); +return ret; + } + }/* PCIe Perf counters won't work on APU nodes */ if (!(adev->flags &AMD_IS_APU )) { ret =device_create_file (adev->dev, &dev_attr_pcie_bw);
@@ -2870,6 +2908,8 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev)device_remove_file (adev->dev, &dev_attr_pp_od_clk_voltage);device_remove_file (adev->dev, &dev_attr_gpu_busy_percent); +if (!(adev->flags &AMD_IS_APU )) +device_remove_file (adev->dev, &dev_attr_mem_busy_percent);if (!(adev->flags &AMD_IS_APU ))device_remove_file (adev->dev, &dev_attr_pcie_bw); if ((adev->asic_type >= CHIP_VEGA10) &&
drivers/gpu/drm/amd/include/kgd_pp_interface.h +1 -0
@@ -109,6 +109,7 @@ enum amd_pp_sensors {AMDGPU_PP_SENSOR_UVD_DCLK ,AMDGPU_PP_SENSOR_VCE_ECCLK ,AMDGPU_PP_SENSOR_GPU_LOAD , +AMDGPU_PP_SENSOR_MEM_LOAD ,AMDGPU_PP_SENSOR_GFX_MCLK ,AMDGPU_PP_SENSOR_GPU_TEMP , AMDGPU_PP_SENSOR_EDGE_TEMP = AMDGPU_PP_SENSOR_GPU_TEMP,
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +14 -2
@@ -2094,6 +2094,7 @@ static int vega20_get_current_clk_freq(struct pp_hwmgr *hwmgr, }static int vega20_get_current_activity_percent (struct pp_hwmgr *hwmgr, +int idx,uint32_t *activity_percent) {int ret =0 ;
@@ -2103,7 +2104,17 @@ static int vega20_get_current_activity_percent(struct pp_hwmgr *hwmgr,if (ret)return ret; - *activity_percent = metrics_table.AverageGfxActivity; +switch (idx) { +case AMDGPU_PP_SENSOR_GPU_LOAD : + *activity_percent = metrics_table.AverageGfxActivity; +break ; +case AMDGPU_PP_SENSOR_MEM_LOAD : + *activity_percent = metrics_table.AverageUclkActivity; +break ; +default : +pr_err ("Invalid index for retrieving clock activity\n" ); +return -EINVAL ; + }return ret; }
@@ -2134,7 +2145,8 @@ static int vega20_read_sensor(struct pp_hwmgr *hwmgr, int idx, *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =vega20_get_current_activity_percent (hwmgr, (uint32_t *)value); +case AMDGPU_PP_SENSOR_MEM_LOAD : + ret =vega20_get_current_activity_percent (hwmgr, idx, (uint32_t *)value);if (!ret) *size =4 ;break ;
Signature · 6 lines
2.21.0 _______________________________________________ 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/3 drm/amd/powerplay: expose Vega12 realtime memory utilization
Enable realtime memory utilization report on Vega12.
--- .../gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +14 -2
@@ -1308,6 +1308,7 @@ static int vega12_get_current_mclk_freq(struct pp_hwmgr *hwmgr, uint32_t *mclk_fstatic int vega12_get_current_activity_percent (struct pp_hwmgr *hwmgr, +int idx,uint32_t *activity_percent) {SmuMetrics_t metrics_table;
@@ -1317,7 +1318,17 @@ static int vega12_get_current_activity_percent(if (ret)return ret; - *activity_percent = metrics_table.AverageGfxActivity; +switch (idx) { +case AMDGPU_PP_SENSOR_GPU_LOAD : + *activity_percent = metrics_table.AverageGfxActivity; +break ; +case AMDGPU_PP_SENSOR_MEM_LOAD : + *activity_percent = metrics_table.AverageUclkActivity; +break ; +default : +pr_err ("Invalid index for retrieving clock activity\n" ); +return -EINVAL ; + }return ret; }
@@ -1341,7 +1352,8 @@ static int vega12_read_sensor(struct pp_hwmgr *hwmgr, int idx, *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =vega12_get_current_activity_percent (hwmgr, (uint32_t *)value); +case AMDGPU_PP_SENSOR_MEM_LOAD : + ret =vega12_get_current_activity_percent (hwmgr, idx, (uint32_t *)value);if (!ret) *size =4 ;break ;
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/powerplay: expose SMU7 asics realtime memory utilization
In reply to a message not in the archiveEnable realtime memory utilization report on SMU7 asics.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 ++++- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 ++ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2 ++ drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 ++ drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 ++ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 ++ drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 ++ 8 files changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +4 -1
@@ -3532,9 +3532,12 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx, *size =4 ;return 0 ;case AMDGPU_PP_SENSOR_GPU_LOAD : +case AMDGPU_PP_SENSOR_MEM_LOAD : offset = data->soft_regs_start +smum_get_offsetof (hwmgr, SMU_SoftRegisters, - AverageGraphicsActivity); + (idx ==AMDGPU_PP_SENSOR_GPU_LOAD ) ? + AverageGraphicsActivity: + AverageMemoryActivity); activity_percent =cgs_read_ind_register (hwmgr->device,CGS_IND_REG__SMC , offset); activity_percent +=0x80 ;
drivers/gpu/drm/amd/powerplay/inc/smumgr.h +1 -0
@@ -41,6 +41,7 @@ enum SMU_MEMBER { HandshakeDisables =0 , VoltageChangeTimeout, AverageGraphicsActivity, + AverageMemoryActivity, PreVBlankGap, VBlankTimeout, UcodeLoadStatus,
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +2 -0
@@ -2254,6 +2254,8 @@ static uint32_t ci_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU7_SoftRegisters , VoltageChangeTimeout);case AverageGraphicsActivity:return offsetof(SMU7_SoftRegisters , AverageGraphicsA); +case AverageMemoryActivity: +return offsetof(SMU7_SoftRegisters , AverageMemoryA);case PreVBlankGap:return offsetof(SMU7_SoftRegisters , PreVBlankGap);case VBlankTimeout:
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2 -0
@@ -2304,6 +2304,8 @@ static uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU73_SoftRegisters , VoltageChangeTimeout);case AverageGraphicsActivity:return offsetof(SMU73_SoftRegisters , AverageGraphicsActivity); +case AverageMemoryActivity: +return offsetof(SMU73_SoftRegisters , AverageMemoryActivity);case PreVBlankGap:return offsetof(SMU73_SoftRegisters , PreVBlankGap);case VBlankTimeout:
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +2 -0
@@ -2219,6 +2219,8 @@ static uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU71_SoftRegisters , VoltageChangeTimeout);case AverageGraphicsActivity:return offsetof(SMU71_SoftRegisters , AverageGraphicsActivity); +case AverageMemoryActivity: +return offsetof(SMU71_SoftRegisters , AverageMemoryActivity);case PreVBlankGap:return offsetof(SMU71_SoftRegisters , PreVBlankGap);case VBlankTimeout:
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +2 -0
@@ -2313,6 +2313,8 @@ static uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU74_SoftRegisters , VoltageChangeTimeout);case AverageGraphicsActivity:return offsetof(SMU74_SoftRegisters , AverageGraphicsActivity); +case AverageMemoryActivity: +return offsetof(SMU74_SoftRegisters , AverageMemoryActivity);case PreVBlankGap:return offsetof(SMU74_SoftRegisters , PreVBlankGap);case VBlankTimeout:
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +2 -0
@@ -2611,6 +2611,8 @@ static uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU72_SoftRegisters , VoltageChangeTimeout);case AverageGraphicsActivity:return offsetof(SMU72_SoftRegisters , AverageGraphicsActivity); +case AverageMemoryActivity: +return offsetof(SMU72_SoftRegisters , AverageMemoryActivity);case PreVBlankGap:return offsetof(SMU72_SoftRegisters , PreVBlankGap);case VBlankTimeout:
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +2 -0
@@ -2167,6 +2167,8 @@ static uint32_t vegam_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU75_SoftRegisters , VoltageChangeTimeout);case AverageGraphicsActivity:return offsetof(SMU75_SoftRegisters , AverageGraphicsActivity); +case AverageMemoryActivity: +return offsetof(SMU75_SoftRegisters , AverageMemoryActivity);case PreVBlankGap:return offsetof(SMU75_SoftRegisters , PreVBlankGap);case VBlankTimeout:
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-bySplit this first patch into two, one to add the new sensor type and vega20 implementation, and one to add the new sysfs file. Then make the sysfs file change the last one in the series. With that fixed, the series is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Evan Quan <[email protected]>
Sent: Thursday, April 25, 2019 4:05 AM
To: [email protected]
Cc: Deucher, Alexander; Xu, Feifei; Quan, Evan; Russell, Kent; Freehill, Chris
Subject: [PATCH 1/3] drm/amd/powerplay: expose Vega20 realtime memory utilization
A new sysfs interface mem_busy_percent is added for telling how busy the VRAM is(in percentage).
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 40 +++++++++++++++++++ .../gpu/drm/amd/include/kgd_pp_interface.h | 1 + .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 16 +++++++- 3 files changed, 55 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +40 -0
@@ -1354,6 +1354,32 @@ static ssize_t amdgpu_get_busy_percent(struct device *dev,return snprintf (buf,PAGE_SIZE ,"%d\n" , value); } +/** +* DOC: mem_busy_percent +* +* The amdgpu driver provides a sysfs API for reading how busy the VRAM +* is as a percentage. The file mem_busy_percent is used for this. +* The SMU firmware computes a percentage of load based on the +* aggregate activity level in the IP cores. +*/ +static ssize_t amdgpu_get_memory_busy_percent (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +int r, value, size =sizeof (value); + +/* read the IP busy sensor */ + r =amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_MEM_LOAD , + (void *)&value, &size); + +if (r) +return r; + +return snprintf (buf,PAGE_SIZE ,"%d\n" , value); +} +/** * DOC: pcie_bw *
@@ -1423,6 +1449,8 @@ static DEVICE_ATTR(pp_od_clk_voltage, S_IRUGO | S_IWUSR, amdgpu_set_pp_od_clk_voltage); static DEVICE_ATTR(gpu_busy_percent, S_IRUGO, amdgpu_get_busy_percent, NULL); +static DEVICE_ATTR(mem_busy_percent, S_IRUGO, + amdgpu_get_memory_busy_percent, NULL); static DEVICE_ATTR(pcie_bw, S_IRUGO, amdgpu_get_pcie_bw, NULL); static DEVICE_ATTR(ppfeatures, S_IRUGO | S_IWUSR, amdgpu_get_ppfeature_status,
@@ -2805,6 +2833,16 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) "gpu_busy_level\n");return ret; } +/* APU does not have its own dedicated memory */ +if (!(adev->flags &AMD_IS_APU )) { + ret =device_create_file (adev->dev, + &dev_attr_mem_busy_percent); +if (ret) { +DRM_ERROR ("failed to create device file " +"mem_busy_percent\n" ); +return ret; + } + }/* PCIe Perf counters won't work on APU nodes */ if (!(adev->flags &AMD_IS_APU )) { ret =device_create_file (adev->dev, &dev_attr_pcie_bw);
@@ -2870,6 +2908,8 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev)device_remove_file (adev->dev, &dev_attr_pp_od_clk_voltage);device_remove_file (adev->dev, &dev_attr_gpu_busy_percent); +if (!(adev->flags &AMD_IS_APU )) +device_remove_file (adev->dev, &dev_attr_mem_busy_percent);if (!(adev->flags &AMD_IS_APU ))device_remove_file (adev->dev, &dev_attr_pcie_bw); if ((adev->asic_type >= CHIP_VEGA10) &&
drivers/gpu/drm/amd/include/kgd_pp_interface.h +1 -0
@@ -109,6 +109,7 @@ enum amd_pp_sensors {AMDGPU_PP_SENSOR_UVD_DCLK ,AMDGPU_PP_SENSOR_VCE_ECCLK ,AMDGPU_PP_SENSOR_GPU_LOAD , +AMDGPU_PP_SENSOR_MEM_LOAD ,AMDGPU_PP_SENSOR_GFX_MCLK ,AMDGPU_PP_SENSOR_GPU_TEMP , AMDGPU_PP_SENSOR_EDGE_TEMP = AMDGPU_PP_SENSOR_GPU_TEMP,
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +14 -2
@@ -2094,6 +2094,7 @@ static int vega20_get_current_clk_freq(struct pp_hwmgr *hwmgr, }static int vega20_get_current_activity_percent (struct pp_hwmgr *hwmgr, +int idx,uint32_t *activity_percent) {int ret =0 ;
@@ -2103,7 +2104,17 @@ static int vega20_get_current_activity_percent(struct pp_hwmgr *hwmgr,if (ret)return ret; - *activity_percent = metrics_table.AverageGfxActivity; +switch (idx) { +case AMDGPU_PP_SENSOR_GPU_LOAD : + *activity_percent = metrics_table.AverageGfxActivity; +break ; +case AMDGPU_PP_SENSOR_MEM_LOAD : + *activity_percent = metrics_table.AverageUclkActivity; +break ; +default : +pr_err ("Invalid index for retrieving clock activity\n" ); +return -EINVAL ; + }return ret; }
@@ -2134,7 +2145,8 @@ static int vega20_read_sensor(struct pp_hwmgr *hwmgr, int idx, *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =vega20_get_current_activity_percent (hwmgr, (uint32_t *)value); +case AMDGPU_PP_SENSOR_MEM_LOAD : + ret =vega20_get_current_activity_percent (hwmgr, idx, (uint32_t *)value);if (!ret) *size =4 ;break ;
--
2.21.0
_______________________________________________
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