From 11e603952822c3cff52070e71b25ff3aef92afb1 Mon Sep 17 00:00:00 2001 From: Rex Zhu Date: Wed, 20 Sep 2017 17:33:55 +0800 Subject: [PATCH 1891/4131] drm/amd/powerplay: delete SMUM_FIELD_MASK repeated defining in hwmgr.h Change-Id: I216b73568d1f42d5579bbf97da48d972b46a9bb7 Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu --- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 4 ++-- 1 file 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 efdc1cb..78ab055 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; -- 2.7.4