aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2017-09-20 05:33:55 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 15:14:36 -0400
commit63196fe79b28e2b161a6d951877bdd0451b1f1a3 (patch)
treedc8d19d62f5bba76e12616d028f06582179598a7 /drivers/gpu/drm/amd
parent0041e6007ecb45f4d48f5a445ace73c9196a5f82 (diff)
drm/amd/powerplay: delete SMUM_FIELD_MASK
repeated defining in hwmgr.h 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>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
index efdc1cb7ab63..78ab0556e48f 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
@@ -205,11 +205,11 @@ static int cz_load_mec_firmware(struct pp_hwmgr *hwmgr)
205 cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_CNTL, tmp); 205 cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_CNTL, tmp);
206 206
207 reg_data = smu_lower_32_bits(info.mc_addr) & 207 reg_data = smu_lower_32_bits(info.mc_addr) &
208 SMUM_FIELD_MASK(CP_CPC_IC_BASE_LO, IC_BASE_LO); 208 PHM_FIELD_MASK(CP_CPC_IC_BASE_LO, IC_BASE_LO);
209 cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_LO, reg_data); 209 cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_LO, reg_data);
210 210
211 reg_data = smu_upper_32_bits(info.mc_addr) & 211 reg_data = smu_upper_32_bits(info.mc_addr) &
212 SMUM_FIELD_MASK(CP_CPC_IC_BASE_HI, IC_BASE_HI); 212 PHM_FIELD_MASK(CP_CPC_IC_BASE_HI, IC_BASE_HI);
213 cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_HI, reg_data); 213 cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_HI, reg_data);
214 214
215 return 0; 215 return 0;