From: Lijo Lazar Date: Mon, 11 Jan 2021 05:51:52 +0000 (+0800) Subject: drm/amdgpu/pm: Remove unsupported MP1 messages from aldebaran X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=701db6756ca938b860afb12e0d854f8fc557d98b;p=linux.git drm/amdgpu/pm: Remove unsupported MP1 messages from aldebaran PrepareMp1Reset and SoftReset messages are not supported on aldebaran. Signed-off-by: Lijo Lazar Reviewed-by: Feifei Xu Reviewed-by: Kevin Wang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index 21492ab4c9ac5..9f2482870353e 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1921,9 +1921,6 @@ int smu_set_mp1_state(void *handle, msg = SMU_MSG_PrepareMp1ForUnload; break; case PP_MP1_STATE_RESET: - /*TODO: since the SMU_MSG_PrepareMp1ForReset is retired in Aldebaran - * Add handling here forAldebaran. - */ msg = SMU_MSG_PrepareMp1ForReset; break; case PP_MP1_STATE_NONE: diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c index 2f3c87bf535b9..b561c1eb4678d 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c @@ -108,9 +108,7 @@ static const struct cmn2asic_msg_mapping aldebaran_message_map[SMU_MSG_MAX_COUNT MSG_MAP(SetPptLimit, PPSMC_MSG_SetPptLimit, 0), MSG_MAP(GetPptLimit, PPSMC_MSG_GetPptLimit, 1), MSG_MAP(PrepareMp1ForUnload, PPSMC_MSG_PrepareMp1ForUnload, 0), - MSG_MAP(PrepareMp1ForReset, PPSMC_MSG_PrepareMp1ForReset, 0), MSG_MAP(GfxDriverReset, PPSMC_MSG_GfxDriverReset, 0), - MSG_MAP(SoftReset, PPSMC_MSG_SoftReset, 0), MSG_MAP(RunDcBtc, PPSMC_MSG_RunDcBtc, 0), MSG_MAP(DramLogSetDramAddrHigh, PPSMC_MSG_DramLogSetDramAddrHigh, 0), MSG_MAP(DramLogSetDramAddrLow, PPSMC_MSG_DramLogSetDramAddrLow, 0),