Commit 10eafd3e authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher

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: default avatarEvan Quan <evan.quan@amd.com>
Reported-and-Tested-by: default avatarFlora Cui <flora.cui@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 549db526
...@@ -819,12 +819,6 @@ static int smu_late_init(void *handle) ...@@ -819,12 +819,6 @@ static int smu_late_init(void *handle)
return ret; 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); ret = smu_populate_umd_state_clk(smu);
if (ret) { if (ret) {
dev_err(adev->dev, "Failed to populate UMD state clocks!\n"); dev_err(adev->dev, "Failed to populate UMD state clocks!\n");
...@@ -1364,6 +1358,19 @@ static int smu_hw_init(void *handle) ...@@ -1364,6 +1358,19 @@ static int smu_hw_init(void *handle)
return ret; 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; adev->pm.dpm_enabled = true;
dev_info(adev->dev, "SMU is initialized successfully!\n"); dev_info(adev->dev, "SMU is initialized successfully!\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment