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

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

drm/amd/powerplay: delete SMUM_WAIT_INDIRECT_FIELD 



repeated defining in hwmgr.h
use PHM_WAIT_INDIRECT_FIELD instand.

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 515113f5

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

+0 −11
Original line number Diff line number Diff line
@@ -151,17 +151,6 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); 


#define SMUM_FIELD_MASK(reg, field) reg##__##field##_MASK



#define SMUM_WAIT_INDIRECT_REGISTER_GIVEN_INDEX(hwmgr,			\

					port, index, value, mask)	\

	smum_wait_on_indirect_register(hwmgr,				\

				mm##port##_INDEX, index, value, mask)



#define SMUM_WAIT_INDIRECT_REGISTER(hwmgr, port, reg, value, mask)    \

	    SMUM_WAIT_INDIRECT_REGISTER_GIVEN_INDEX(hwmgr, port, ix##reg, value, mask)



#define SMUM_WAIT_INDIRECT_FIELD(hwmgr, port, reg, field, fieldval)                          \

	    SMUM_WAIT_INDIRECT_REGISTER(hwmgr, port, reg, (fieldval) << SMUM_FIELD_SHIFT(reg, field), \

			            SMUM_FIELD_MASK(reg, field) )



#define SMUM_GET_FIELD(value, reg, field)				\

		(((value) & SMUM_FIELD_MASK(reg, field))		\

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

+1 −1
Original line number Diff line number Diff line
@@ -1938,7 +1938,7 @@ static int ci_start_smc(struct pp_hwmgr *hwmgr) 


	PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_RESET_CNTL, rst_reg, 0);



	SMUM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS,

	PHM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS,

				 INTERRUPTS_ENABLED, 1);



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int iceland_smu_start_smc(struct pp_hwmgr *hwmgr) 
	/* de-assert reset */

	iceland_start_smc(hwmgr);



	SMUM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS,

	PHM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS,

				 INTERRUPTS_ENABLED, 1);



	return 0;