Commit be49be40 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: use SMU_IND_INDEX/DATA_11 pair 



in VFPF macros to support virtualization

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b3b03052

drivers/gpu/drm/amd/powerplay/inc/smumgr.h

+2 −2
Original line number Diff line number Diff line
@@ -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) \

drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE