diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2018-01-19 02:44:49 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:18:18 -0500 |
commit | b7e919b9403fe5fb653d274d530d5118a3408f1b (patch) | |
tree | 06795a15005627b4a80faacf43c92ebe8b15eea0 /drivers/gpu | |
parent | 3abb20264db563fc45f78ab323d9c6c4c533efe9 (diff) |
drm/amd/pp: Disable OD feature on APU/Iceland
Not supported on APUs or Iceland.
and still not enabled on CI.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 26904462d23a..33eabc18211d 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | |||
@@ -167,9 +167,11 @@ int hwmgr_early_init(struct pp_instance *handle) | |||
167 | hwmgr->feature_mask &= ~(PP_VBI_TIME_SUPPORT_MASK | | 167 | hwmgr->feature_mask &= ~(PP_VBI_TIME_SUPPORT_MASK | |
168 | PP_ENABLE_GFX_CG_THRU_SMU); | 168 | PP_ENABLE_GFX_CG_THRU_SMU); |
169 | hwmgr->pp_table_version = PP_TABLE_V0; | 169 | hwmgr->pp_table_version = PP_TABLE_V0; |
170 | hwmgr->od_enabled = false; | ||
170 | smu7_init_function_pointers(hwmgr); | 171 | smu7_init_function_pointers(hwmgr); |
171 | break; | 172 | break; |
172 | case AMDGPU_FAMILY_CZ: | 173 | case AMDGPU_FAMILY_CZ: |
174 | hwmgr->od_enabled = false; | ||
173 | hwmgr->smumgr_funcs = &cz_smu_funcs; | 175 | hwmgr->smumgr_funcs = &cz_smu_funcs; |
174 | cz_init_function_pointers(hwmgr); | 176 | cz_init_function_pointers(hwmgr); |
175 | break; | 177 | break; |
@@ -181,6 +183,7 @@ int hwmgr_early_init(struct pp_instance *handle) | |||
181 | hwmgr->feature_mask &= ~ (PP_VBI_TIME_SUPPORT_MASK | | 183 | hwmgr->feature_mask &= ~ (PP_VBI_TIME_SUPPORT_MASK | |
182 | PP_ENABLE_GFX_CG_THRU_SMU); | 184 | PP_ENABLE_GFX_CG_THRU_SMU); |
183 | hwmgr->pp_table_version = PP_TABLE_V0; | 185 | hwmgr->pp_table_version = PP_TABLE_V0; |
186 | hwmgr->od_enabled = false; | ||
184 | break; | 187 | break; |
185 | case CHIP_TONGA: | 188 | case CHIP_TONGA: |
186 | hwmgr->smumgr_funcs = &tonga_smu_funcs; | 189 | hwmgr->smumgr_funcs = &tonga_smu_funcs; |
@@ -218,6 +221,7 @@ int hwmgr_early_init(struct pp_instance *handle) | |||
218 | case AMDGPU_FAMILY_RV: | 221 | case AMDGPU_FAMILY_RV: |
219 | switch (hwmgr->chip_id) { | 222 | switch (hwmgr->chip_id) { |
220 | case CHIP_RAVEN: | 223 | case CHIP_RAVEN: |
224 | hwmgr->od_enabled = false; | ||
221 | hwmgr->smumgr_funcs = &rv_smu_funcs; | 225 | hwmgr->smumgr_funcs = &rv_smu_funcs; |
222 | rv_init_function_pointers(hwmgr); | 226 | rv_init_function_pointers(hwmgr); |
223 | break; | 227 | break; |