diff options
| author | Evan Quan <evan.quan@amd.com> | 2020-06-08 13:04:42 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-07-01 08:59:18 +0300 |
| commit | 10eafd3e56fde46869d8f46d19c2dc80bdd23bba (patch) | |
| tree | ef34f0b5923d6ded4a728c7c8bbe7c5d161d5507 /drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | |
| parent | 549db52682cb1282b5ac230626fddfeb4b74b409 (diff) | |
| download | linux-10eafd3e56fde46869d8f46d19c2dc80bdd23bba.tar.xz | |
drm/amd/powerplay: move maximum sustainable clock retrieving to .hw_init
Since DAL settings come between .hw_init and .late_init of SMU. And
DAL needs to know the maximum sustainable clocks.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reported-and-Tested-by: Flora Cui <flora.cui@amd.com>
Acked-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 | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 725ac90c0f36..6beae3b496be 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -819,12 +819,6 @@ static int smu_late_init(void *handle) return ret; } - ret = smu_init_max_sustainable_clocks(smu); - if (ret) { - dev_err(adev->dev, "Failed to init max sustainable clocks!\n"); - return ret; - } - ret = smu_populate_umd_state_clk(smu); if (ret) { dev_err(adev->dev, "Failed to populate UMD state clocks!\n"); @@ -1364,6 +1358,19 @@ static int smu_hw_init(void *handle) return ret; } + /* + * Move maximum sustainable clock retrieving here considering + * 1. It is not needed on resume(from S3). + * 2. DAL settings come between .hw_init and .late_init of SMU. + * And DAL needs to know the maximum sustainable clocks. Thus + * it cannot be put in .late_init(). + */ + ret = smu_init_max_sustainable_clocks(smu); + if (ret) { + dev_err(adev->dev, "Failed to init max sustainable clocks!\n"); + return ret; + } + adev->pm.dpm_enabled = true; dev_info(adev->dev, "SMU is initialized successfully!\n"); |