diff options
| author | Rex Zhu <Rex.Zhu@amd.com> | 2017-09-20 16:49:29 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 15:14:28 -0400 |
| commit | be49be4085d977af566e8d2f9c52ecc1f31b59ad (patch) | |
| tree | 666e08e6e02a3981e0bffb7ac6f4b492aa5acce4 | |
| parent | b3b030520df05fca7f2dcca455c9628f483a1f95 (diff) | |
drm/amd/powerplay: use SMU_IND_INDEX/DATA_11 pair
in VFPF macros to support virtualization
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>
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h index 8bdffaa14b43..54b151b03aa8 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h @@ -195,12 +195,12 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); #define SMUM_WAIT_VFPF_INDIRECT_REGISTER_GIVEN_INDEX(hwmgr, \ port, index, value, mask) \ smum_wait_on_indirect_register(hwmgr, \ - mm##port##_INDEX_0, index, value, mask) + mm##port##_INDEX_11, index, value, mask) #define SMUM_WAIT_VFPF_INDIRECT_REGISTER_UNEQUAL_GIVEN_INDEX(hwmgr, \ port, index, value, mask) \ smum_wait_for_indirect_register_unequal(hwmgr, \ - mm##port##_INDEX_0, index, value, mask) + mm##port##_INDEX_11, index, value, mask) #define SMUM_WAIT_VFPF_INDIRECT_REGISTER(hwmgr, port, reg, value, mask) \ diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c index c2fc237a136a..ccd65819722b 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c @@ -2345,7 +2345,7 @@ static int ci_upload_firmware(struct pp_hwmgr *hwmgr) pr_info("smc is running, no need to load smc firmware\n"); return 0; } - SMUM_WAIT_VFPF_INDIRECT_FIELD(hwmgr, SMC_IND, RCU_UC_EVENTS, + PHM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, RCU_UC_EVENTS, boot_seq_done, 1); PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_MISC_CNTL, pre_fetcher_en, 1); |