openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/powerplay: delete SMU_WRITE_INDIRECT_FIELD 

the macro is as same as PHM_WRITE_INDIRECT_FIELD

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rex Zhu 2017-09-20 17:17:08 +08:00 committed by Alex Deucher
parent 538fdf1fe7
commit fbabae4696
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/amd/powerplay/inc/smumgr.h
View File

@ -179,11 +179,6 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr);
SMUM_GET_FIELD(cgs_read_ind_register(device, port, ix##reg), \ SMUM_GET_FIELD(cgs_read_ind_register(device, port, ix##reg), \
reg, field) reg, field)
/*Operations on named fields.*/ /*Operations on named fields.*/
#define SMUM_READ_VFPF_INDIRECT_FIELD(device, port, reg, field) \ #define SMUM_READ_VFPF_INDIRECT_FIELD(device, port, reg, field) \
@ -199,14 +194,4 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr);
SMUM_SET_FIELD(cgs_read_ind_register(device, port, ix##reg), \ SMUM_SET_FIELD(cgs_read_ind_register(device, port, ix##reg), \
reg, field, fieldval)) reg, field, fieldval))
#define SMUM_WRITE_INDIRECT_FIELD(device, port, reg, field, fieldval) \
cgs_write_ind_register(device, port, ix##reg, \
SMUM_SET_FIELD(cgs_read_ind_register(device, port, ix##reg), \
reg, field, fieldval))
#endif #endif

4
drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
View File

@ -1934,9 +1934,9 @@ static int ci_start_smc(struct pp_hwmgr *hwmgr)
ci_program_jump_on_start(hwmgr); ci_program_jump_on_start(hwmgr);
/* enable smc clock */ /* enable smc clock */
SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_CLOCK_CNTL_0, ck_disable, 0); PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_CLOCK_CNTL_0, ck_disable, 0);
SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_RESET_CNTL, rst_reg, 0); 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, SMUM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS,
INTERRUPTS_ENABLED, 1); INTERRUPTS_ENABLED, 1);

8
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
View File

@ -41,7 +41,7 @@
static int iceland_start_smc(struct pp_hwmgr *hwmgr) static int iceland_start_smc(struct pp_hwmgr *hwmgr)
{ {
SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
SMC_SYSCON_RESET_CNTL, rst_reg, 0); SMC_SYSCON_RESET_CNTL, rst_reg, 0);
return 0; return 0;
@ -49,7 +49,7 @@ static int iceland_start_smc(struct pp_hwmgr *hwmgr)
static void iceland_reset_smc(struct pp_hwmgr *hwmgr) static void iceland_reset_smc(struct pp_hwmgr *hwmgr)
{ {
SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
SMC_SYSCON_RESET_CNTL, SMC_SYSCON_RESET_CNTL,
rst_reg, 1); rst_reg, 1);
} }
@ -57,14 +57,14 @@ static void iceland_reset_smc(struct pp_hwmgr *hwmgr)
static void iceland_stop_smc_clock(struct pp_hwmgr *hwmgr) static void iceland_stop_smc_clock(struct pp_hwmgr *hwmgr)
{ {
SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
SMC_SYSCON_CLOCK_CNTL_0, SMC_SYSCON_CLOCK_CNTL_0,
ck_disable, 1); ck_disable, 1);
} }
static void iceland_start_smc_clock(struct pp_hwmgr *hwmgr) static void iceland_start_smc_clock(struct pp_hwmgr *hwmgr)
{ {
SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
SMC_SYSCON_CLOCK_CNTL_0, SMC_SYSCON_CLOCK_CNTL_0,
ck_disable, 0); ck_disable, 0);
} }