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

drm/amd/powerplay: add CI asics support to smumgr (v3) 



This ports support for CI asics (Bonaire, Hawaii)
to the powerplay smumgr

v2: warning fix (Alex)
v3: squash in fix for thermal (Tom)

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 510c2558

drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h

+2 −0
Original line number Diff line number Diff line
@@ -5454,5 +5454,7 @@ 
#define ROM_SW_DATA_64__ROM_SW_DATA__SHIFT 0x0

#define CURRENT_PG_STATUS__VCE_PG_STATUS_MASK 0x00000002

#define CURRENT_PG_STATUS__UVD_PG_STATUS_MASK 0x00000004

#define SMC_SYSCON_MISC_CNTL__pre_fetcher_en_MASK  0x1

#define SMC_SYSCON_MISC_CNTL__pre_fetcher_en__SHIFT 0



#endif /* SMU_7_0_1_SH_MASK_H */

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct pp_hwmgr; 
#define smu_lower_32_bits(n) ((uint32_t)(n))

#define smu_upper_32_bits(n) ((uint32_t)(((n)>>16)>>16))



extern const struct pp_smumgr_func ci_smu_funcs;

extern const struct pp_smumgr_func cz_smu_funcs;

extern const struct pp_smumgr_func iceland_smu_funcs;

extern const struct pp_smumgr_func tonga_smu_funcs;

drivers/gpu/drm/amd/powerplay/smumgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o fiji_smc.o \

	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \

	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o

	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smc.o ci_smumgr.o



AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))

CRA Git | Maintained and supported by SUSTech CRA and CCSE