Skip to content

Commit 941f0cb

Browse files
Jie1zhangalexdeucher
authored andcommitted
revert "drm/amdgpu/pm: Implement SDMA queue reset for different asic"
pmfw unified 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 e9b86b8 commit 941f0cb

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

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

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,29 +2833,17 @@ static int smu_v13_0_6_send_rma_reason(struct smu_context *smu)
28332833

28342834
static int smu_v13_0_6_reset_sdma(struct smu_context *smu, uint32_t inst_mask)
28352835
{
2836-
uint32_t smu_program;
2836+
struct amdgpu_device *adev = smu->adev;
28372837
int ret = 0;
28382838

2839-
smu_program = (smu->smc_fw_version >> 24) & 0xff;
2840-
switch (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)) {
2841-
case IP_VERSION(13, 0, 6):
2842-
if ((smu_program == 7 || smu_program == 0) &&
2843-
smu_v13_0_6_caps_supported(smu, SMU_CAPS(SDMA_RESET)))
2844-
ret = smu_cmn_send_smc_msg_with_param(smu,
2845-
SMU_MSG_ResetSDMA, inst_mask, NULL);
2846-
else if ((smu_program == 4) &&
2847-
smu_v13_0_6_caps_supported(smu, SMU_CAPS(SDMA_RESET)))
2848-
ret = smu_cmn_send_smc_msg_with_param(smu,
2849-
SMU_MSG_ResetSDMA2, inst_mask, NULL);
2850-
break;
2851-
case IP_VERSION(13, 0, 14):
2852-
if (smu_v13_0_6_caps_supported(smu, SMU_CAPS(SDMA_RESET)))
2853-
ret = smu_cmn_send_smc_msg_with_param(smu,
2854-
SMU_MSG_ResetSDMA2, inst_mask, NULL);
2855-
break;
2856-
default:
2857-
break;
2858-
}
2839+
/* the message is only valid on SMU 13.0.6 with pmfw 85.121.00 and above */
2840+
if ((adev->flags & AMD_IS_APU) ||
2841+
amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6) ||
2842+
smu->smc_fw_version < 0x00557900)
2843+
return 0;
2844+
2845+
ret = smu_cmn_send_smc_msg_with_param(smu,
2846+
SMU_MSG_ResetSDMA, inst_mask, NULL);
28592847

28602848
if (ret)
28612849
dev_err(smu->adev->dev,

0 commit comments

Comments
 (0)