diff options
| author | Evan Quan <evan.quan@amd.com> | 2020-06-08 16:41:16 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-07-01 01:59:18 -0400 |
| commit | a141b4e3c722c1c0f72177e258f2cb591949018b (patch) | |
| tree | 10105ad4438d1545968812b9d15b8b4d430e0d71 /drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | |
| parent | 1e239fdd31cdf1729bc1e8b4538bf590bd28de57 (diff) | |
drm/amd/powerplay: simplify the code around retrieving power limit
Use the cached max/current power limit for other cases except
.late_init.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/amdgpu_smu.c')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index a5fd1284ff1c..6757f65fd87e 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -831,9 +831,9 @@ static int smu_late_init(void *handle) return ret; } - ret = smu_get_power_limit(smu, &smu->default_power_limit, false, false); + ret = smu_get_asic_power_limits(smu); if (ret) { - dev_err(adev->dev, "Failed to get default power limit!\n"); + dev_err(adev->dev, "Failed to get asic power limits!\n"); return ret; } @@ -2222,8 +2222,7 @@ int smu_get_power_limit(struct smu_context *smu, mutex_lock(&smu->mutex); } - if (smu->ppt_funcs->get_power_limit) - ret = smu->ppt_funcs->get_power_limit(smu, limit, def); + *limit = (def ? smu->max_power_limit : smu->current_power_limit); if (lock_needed) mutex_unlock(&smu->mutex); |