aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
diff options
context:
space:
mode:
authorKenneth Feng <kenneth.feng@amd.com>2019-07-23 12:16:25 +0800
committerAlex Deucher <alexander.deucher@amd.com>2019-08-12 12:47:48 -0500
commit9b4e63f4513bbd626b2490ce81435a38d7bc3902 (patch)
treead43744728c79ddba780e945568a8096d3c200db /drivers/gpu/drm/amd/powerplay/navi10_ppt.c
parentdrm/amdgpu: split athub clock gating from mmhub (diff)
downloadlinux-dev-9b4e63f4513bbd626b2490ce81435a38d7bc3902.tar.xz
linux-dev-9b4e63f4513bbd626b2490ce81435a38d7bc3902.zip
drm/amd/powerplay: change smu_read_sensor sequence in smu
change the smu_read_sensor sequence to: asic specific sensor read -> smu v11 specific sensor read -> smu v11 common sensor read Signed-off-by: Kenneth Feng <kenneth.feng@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/navi10_ppt.c')
-rw-r--r--drivers/gpu/drm/amd/powerplay/navi10_ppt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index bd1df50d172c..4947a526cbdf 100644
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1386,6 +1386,9 @@ static int navi10_read_sensor(struct smu_context *smu,
struct smu_table_context *table_context = &smu->smu_table;
PPTable_t *pptable = table_context->driver_pptable;
+ if(!data || !size)
+ return -EINVAL;
+
switch (sensor) {
case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
*(uint32_t *)data = pptable->FanMaximumRpm;
@@ -1407,7 +1410,7 @@ static int navi10_read_sensor(struct smu_context *smu,
*size = 4;
break;
default:
- return -EINVAL;
+ ret = smu_smc_read_sensor(smu, sensor, data, size);
}
return ret;