aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2356-drm-amd-powerplay-move-read-sensor-of-UVD-VCE-_POWER.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2356-drm-amd-powerplay-move-read-sensor-of-UVD-VCE-_POWER.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2356-drm-amd-powerplay-move-read-sensor-of-UVD-VCE-_POWER.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2356-drm-amd-powerplay-move-read-sensor-of-UVD-VCE-_POWER.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2356-drm-amd-powerplay-move-read-sensor-of-UVD-VCE-_POWER.patch
new file mode 100644
index 00000000..d08e2a6b
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2356-drm-amd-powerplay-move-read-sensor-of-UVD-VCE-_POWER.patch
@@ -0,0 +1,57 @@
+From 14f19f124065920e204dee948920348358ba3fe1 Mon Sep 17 00:00:00 2001
+From: Kevin Wang <kevin1.wang@amd.com>
+Date: Tue, 23 Apr 2019 11:20:46 +0800
+Subject: [PATCH 2356/2940] drm/amd/powerplay: move read sensor of
+ UVD[VCE]_POWER to amdgpu_smu file
+
+This part of code is asic unrelated and moves to top code level.
+
+Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
+Reviewed-by: Huang Rui <ray.huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 ++++++++
+ drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 8 --------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+index 482fdad1d5f9..cff17a2ddca3 100644
+--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+@@ -255,6 +255,14 @@ int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor,
+ ret = smu_feature_get_enabled_mask(smu, (uint32_t *)data, 2);
+ *size = 8;
+ break;
++ case AMDGPU_PP_SENSOR_UVD_POWER:
++ *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UVD_BIT) ? 1 : 0;
++ *size = 4;
++ break;
++ case AMDGPU_PP_SENSOR_VCE_POWER:
++ *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_VCE_BIT) ? 1 : 0;
++ *size = 4;
++ break;
+ default:
+ ret = -EINVAL;
+ break;
+diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+index 55d1649d6111..94374827a83b 100644
+--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+@@ -2946,14 +2946,6 @@ static int vega20_read_sensor(struct smu_context *smu,
+ PPTable_t *pptable = table_context->driver_pptable;
+
+ switch (sensor) {
+- case AMDGPU_PP_SENSOR_UVD_POWER:
+- *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UVD_BIT) ? 1 : 0;
+- *size = 4;
+- break;
+- case AMDGPU_PP_SENSOR_VCE_POWER:
+- *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_VCE_BIT) ? 1 : 0;
+- *size = 4;
+- break;
+ case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
+ *(uint32_t *)data = pptable->FanMaximumRpm;
+ *size = 4;
+--
+2.17.1
+