summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/powerplay
diff options
context:
space:
mode:
authorRex Zhu2017-09-20 11:33:55 +0200
committerAlex Deucher2017-09-26 21:14:36 +0200
commit63196fe79b28e2b161a6d951877bdd0451b1f1a3 (patch)
treedc8d19d62f5bba76e12616d028f06582179598a7 /drivers/gpu/drm/amd/powerplay
parentdrm/amd/powerplay: delete SMUM_WAIT_INDIRECT_FIELD (diff)
downloadkernel-qcow2-linux-63196fe79b28e2b161a6d951877bdd0451b1f1a3.tar.gz
kernel-qcow2-linux-63196fe79b28e2b161a6d951877bdd0451b1f1a3.tar.xz
kernel-qcow2-linux-63196fe79b28e2b161a6d951877bdd0451b1f1a3.zip
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/powerplay')
-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)
cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_CNTL, tmp);
reg_data = smu_lower_32_bits(info.mc_addr) &
- SMUM_FIELD_MASK(CP_CPC_IC_BASE_LO, IC_BASE_LO);
+ PHM_FIELD_MASK(CP_CPC_IC_BASE_LO, IC_BASE_LO);
cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_LO, reg_data);
reg_data = smu_upper_32_bits(info.mc_addr) &
- SMUM_FIELD_MASK(CP_CPC_IC_BASE_HI, IC_BASE_HI);
+ PHM_FIELD_MASK(CP_CPC_IC_BASE_HI, IC_BASE_HI);
cgs_write_register(hwmgr->device, mmCP_CPC_IC_BASE_HI, reg_data);
return 0;