Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amd/powerplay: delete SMUM_READ_FIELD 



repeated defining in hwmgr.h

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 95175869

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

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); 
		(((value) & SMUM_FIELD_MASK(reg, field))		\

		>> SMUM_FIELD_SHIFT(reg, field))



#define SMUM_READ_FIELD(device, reg, field)                           \

		SMUM_GET_FIELD(cgs_read_register(device, mm##reg), reg, field)



#define SMUM_READ_INDIRECT_FIELD(device, port, reg, field) \

	    SMUM_GET_FIELD(cgs_read_ind_register(device, port, ix##reg), \

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

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ int ci_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg) 


	PHM_WAIT_FIELD_UNEQUAL(hwmgr, SMC_RESP_0, SMC_RESP, 0);



	ret = SMUM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP);

	ret = PHM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP);



	if (ret != 1)

		pr_info("\n failed to send message %x ret is %d\n",  msg, ret);

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

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static int polaris10_populate_single_memory_level(struct pp_hwmgr *hwmgr, 


	if (mclk_stutter_mode_threshold &&

		(clock <= mclk_stutter_mode_threshold) &&

		(SMUM_READ_FIELD(hwmgr->device, DPG_PIPE_STUTTER_CONTROL,

		(PHM_READ_FIELD(hwmgr->device, DPG_PIPE_STUTTER_CONTROL,

				STUTTER_ENABLE) & 0x1))

		mem_level->StutterEnable = true;

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

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int smu7_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg) 


	PHM_WAIT_FIELD_UNEQUAL(hwmgr, SMC_RESP_0, SMC_RESP, 0);



	ret = SMUM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP);

	ret = PHM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP);



	if (ret != 1)

		pr_info("\n failed to send pre message %x ret is %d \n",  msg, ret);
@@ -181,7 +181,7 @@ int smu7_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg) 


	PHM_WAIT_FIELD_UNEQUAL(hwmgr, SMC_RESP_0, SMC_RESP, 0);



	ret = SMUM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP);

	ret = PHM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP);



	if (ret != 1)

		pr_info("\n failed to send message %x ret is %d \n",  msg, ret);
@@ -224,7 +224,7 @@ int smu7_send_msg_to_smc_offset(struct pp_hwmgr *hwmgr) 


	PHM_WAIT_FIELD_UNEQUAL(hwmgr, SMC_RESP_0, SMC_RESP, 0);



	if (1 != SMUM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP))

	if (1 != PHM_READ_FIELD(hwmgr->device, SMC_RESP_0, SMC_RESP))

		pr_info("Failed to send Message.\n");



	return 0;