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

drm/amd/pp: Fix gfx ring test failed on Fiji without hw avfs support 



caused by
'commit ca82cec868d1 ("drm/amd/pp: Simplified the avfs btc state on smu7")'

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 eb4900aa

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

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,9 @@ static int fiji_setup_graphics_level_structure(struct pp_hwmgr *hwmgr) 


static int fiji_avfs_event_mgr(struct pp_hwmgr *hwmgr)

{

	if (!hwmgr->avfs_supported)

		return 0;



	PP_ASSERT_WITH_CODE(0 == fiji_setup_graphics_level_structure(hwmgr),

			"[AVFS][fiji_avfs_event_mgr] Could not Copy Graphics Level"

			" table over to SMU",

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

+4 −2
Original line number Diff line number Diff line
@@ -172,11 +172,13 @@ static int polaris10_setup_graphics_level_structure(struct pp_hwmgr *hwmgr) 
}





static int

polaris10_avfs_event_mgr(struct pp_hwmgr *hwmgr)

static int polaris10_avfs_event_mgr(struct pp_hwmgr *hwmgr)

{

	struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(hwmgr->smu_backend);



	if (!hwmgr->avfs_supported)

		return 0;



	PP_ASSERT_WITH_CODE(0 == polaris10_setup_graphics_level_structure(hwmgr),

		"[AVFS][Polaris10_AVFSEventMgr] Could not Copy Graphics Level table over to SMU",

		return -EINVAL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE