diff options
| author | Huang Rui <ray.huang@amd.com> | 2019-02-20 19:58:11 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-03-19 15:04:02 -0500 |
| commit | d4631cba9ebe6743df123e7c99372dfb2f840d1f (patch) | |
| tree | 58dfa45ddb4c9fa42aa9b658997a8ae2babd20a0 | |
| parent | 2dd1209e5760686efbf17fc6564fa58e8bb59ad1 (diff) | |
| download | linux-d4631cba9ebe6743df123e7c99372dfb2f840d1f.tar.bz2 | |
drm/amd/powerplay: move setting allowed mask and feature enabling together
This patch moves setting allowed mask and feature enabling together to refine
the programming sequence.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 7857ceb7403f..fa6248d8adf9 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -586,10 +586,6 @@ static int smu_smc_table_hw_init(struct smu_context *smu, if (ret) return ret; - ret = smu_feature_set_allowed_mask(smu); - if (ret) - return ret; - if (initialize) { ret = smu_read_pptable_from_vbios(smu); if (ret) @@ -654,6 +650,10 @@ static int smu_smc_table_hw_init(struct smu_context *smu, if (ret) return ret; + ret = smu_feature_set_allowed_mask(smu); + if (ret) + return ret; + ret = smu_system_features_control(smu, true); if (ret) return ret; |