On Mon, Dec 16, 2024 at 4:30 AM Jesse.zhang@xxxxxxx <jesse.zhang@xxxxxxx> wrote:
>
> Implement sdma queue reset by SMU_MSG_ResetSDMA2
>
> Suggested-by: Tim Huang <tim.huang@xxxxxxx>
> Signed-off-by: Jesse Zhang <jesse.zhang@xxxxxxx>
Series is:
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 30 ++++++++++++++-----
> 1 file changed, 22 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> index 9222e7a777a6..446959145058 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> @@ -2721,17 +2721,31 @@ static int smu_v13_0_6_send_rma_reason(struct smu_context *smu)
>
> static int smu_v13_0_6_reset_sdma(struct smu_context *smu, uint32_t inst_mask)
> {
> - struct amdgpu_device *adev = smu->adev;
> + uint32_t smu_program;
> int ret = 0;
>
> - /* the message is only valid on SMU 13.0.6 with pmfw 85.121.00 and above */
> - if ((adev->flags & AMD_IS_APU) ||
> - amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6) ||
> - smu->smc_fw_version < 0x00557900)
> - return 0;
> + smu_program = (smu->smc_fw_version >> 24) & 0xff;
> + switch (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)) {
> + case IP_VERSION(13, 0, 6):
> + if (((smu_program == 7) && (smu->smc_fw_version > 0x07550763)) ||
> + ((smu_program == 0) && (smu->smc_fw_version > 0x00557700)))
> + ret = smu_cmn_send_smc_msg_with_param(smu,
> + SMU_MSG_ResetSDMA, inst_mask, NULL);
> + else if ((smu_program == 4) &&
> + (smu->smc_fw_version > 0x4556e6c))
> + ret = smu_cmn_send_smc_msg_with_param(smu,
> + SMU_MSG_ResetSDMA2, inst_mask, NULL);
> + break;
> + case IP_VERSION(13, 0, 14):
> + if ((smu_program == 5) &&
> + (smu->smc_fw_version > 0x05550f00))
> + ret = smu_cmn_send_smc_msg_with_param(smu,
> + SMU_MSG_ResetSDMA2, inst_mask, NULL);
> + break;
> + default:
> + break;
> + }
>
> - ret = smu_cmn_send_smc_msg_with_param(smu,
> - SMU_MSG_ResetSDMA, inst_mask, NULL);
> if (ret)
> dev_err(smu->adev->dev,
> "failed to send ResetSDMA event with mask 0x%x\n",
> --
> 2.25.1
>
