Skip to content

Commit 2e76184

Browse files
Jie1zhangalexdeucher
authored andcommitted
revert "drm/amdgpu/pm: add definition PPSMC_MSG_ResetSDMA2"
pmfw now unifies PPSMC_MSG_ResetSDMA definitions for different devices. PPSMC_MSG_ResetSDMA2 is not needed. Signed-off-by: Jesse Zhang <jesse.zhang@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 941f0cb commit 2e76184

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
#define PPSMC_MSG_SelectPLPDMode 0x40
9494
#define PPSMC_MSG_RmaDueToBadPageThreshold 0x43
9595
#define PPSMC_MSG_SelectPstatePolicy 0x44
96-
#define PPSMC_MSG_ResetSDMA2 0x45
9796
#define PPSMC_MSG_ResetSDMA 0x4D
9897
#define PPSMC_Message_Count 0x4E
9998

drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@
276276
__SMU_DUMMY_MAP(SelectPstatePolicy), \
277277
__SMU_DUMMY_MAP(MALLPowerController), \
278278
__SMU_DUMMY_MAP(MALLPowerState), \
279-
__SMU_DUMMY_MAP(ResetSDMA), \
280-
__SMU_DUMMY_MAP(ResetSDMA2),
279+
__SMU_DUMMY_MAP(ResetSDMA),
281280

282281
#undef __SMU_DUMMY_MAP
283282
#define __SMU_DUMMY_MAP(type) SMU_MSG_##type

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ static const struct cmn2asic_msg_mapping smu_v13_0_6_message_map[SMU_MSG_MAX_COU
196196
MSG_MAP(RmaDueToBadPageThreshold, PPSMC_MSG_RmaDueToBadPageThreshold, 0),
197197
MSG_MAP(SelectPstatePolicy, PPSMC_MSG_SelectPstatePolicy, 0),
198198
MSG_MAP(ResetSDMA, PPSMC_MSG_ResetSDMA, 0),
199-
MSG_MAP(ResetSDMA2, PPSMC_MSG_ResetSDMA2, 0),
200199
};
201200

202201
// clang-format on

0 commit comments

Comments
 (0)