1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2845-drm-amdgpu-navi10-add-uclk-activity-sensor.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2845-drm-amdgpu-navi10-add-uclk-activity-sensor.patch
new file mode 100644
index 00000000..d7ce8ac3
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2845-drm-amdgpu-navi10-add-uclk-activity-sensor.patch
@@ -0,0 +1,58 @@
+From 6c852528bd34eae2ef668fa768b019e95a62d87d Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Wed, 3 Jul 2019 21:39:10 -0500
+Subject: [PATCH 2845/2940] drm/amdgpu/navi10: add uclk activity sensor
+
+Query the metrics table for the current uclk activity.
+
+Reviewed-by: Evan Quan <evan.quan@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+index 684f5cb9b8eb..5ee6508f1d13 100644
+--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
++++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+@@ -879,6 +879,7 @@ static int navi10_get_gpu_power(struct smu_context *smu, uint32_t *value)
+ }
+ 
+ static int navi10_get_current_activity_percent(struct smu_context *smu,
++					       enum amd_pp_sensors sensor,
+ 					       uint32_t *value)
+ {
+ 	int ret = 0;
+@@ -894,7 +895,17 @@ static int navi10_get_current_activity_percent(struct smu_context *smu,
+ 	if (ret)
+ 		return ret;
+ 
+-	*value = metrics.AverageGfxActivity;
++	switch (sensor) {
++	case AMDGPU_PP_SENSOR_GPU_LOAD:
++		*value = metrics.AverageGfxActivity;
++		break;
++	case AMDGPU_PP_SENSOR_MEM_LOAD:
++		*value = metrics.AverageUclkActivity;
++		break;
++	default:
++		pr_err("Invalid sensor for retrieving clock activity\n");
++		return -EINVAL;
++	}
+ 
+ 	return 0;
+ }
+@@ -1307,8 +1318,9 @@ static int navi10_read_sensor(struct smu_context *smu,
+ 		*(uint32_t *)data = pptable->FanMaximumRpm;
+ 		*size = 4;
+ 		break;
++	case AMDGPU_PP_SENSOR_MEM_LOAD:
+ 	case AMDGPU_PP_SENSOR_GPU_LOAD:
+-		ret = navi10_get_current_activity_percent(smu, (uint32_t *)data);
++		ret = navi10_get_current_activity_percent(smu, sensor, (uint32_t *)data);
+ 		*size = 4;
+ 		break;
+ 	case AMDGPU_PP_SENSOR_GPU_POWER:
+-- 
+2.17.1
+