Skip to content

Commit

Permalink
drm/amd/pm: Refactor SMU 13.0.6 SDMA reset firmware version checks
Browse files Browse the repository at this point in the history
This patch refactors the firmware version checks in `smu_v13_0_6_reset_sdma`
to support multiple SMU programs with different firmware version thresholds.

V2: return -EOPNOTSUPP for unspported pmfw

Suggested-by: Lazar Lijo <Lijo.Lazar@amd.com>
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>
  • Loading branch information
Jesse.zhang@amd.com authored and Alex Deucher committed Jan 24, 2025
1 parent 2e76184 commit 875596b
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2834,12 +2834,19 @@ static int smu_v13_0_6_reset_sdma(struct smu_context *smu, uint32_t inst_mask)
{
struct amdgpu_device *adev = smu->adev;
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;
uint32_t smu_program;

smu_program = (smu->smc_fw_version >> 24) & 0xff;
/* the message is only valid on SMU 13.0.6/12/14 with these pmfw and above */
if (((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12)) &&
(smu->smc_fw_version < 0x00561700)) ||
((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 14)) &&
(smu->smc_fw_version < 0x5551200)) ||
((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 6)) &&
(((smu_program == 0) && (smu->smc_fw_version < 0x00557900)) ||
((smu_program == 4) && (smu->smc_fw_version < 0x4557000)) ||
((smu_program == 7) && (smu->smc_fw_version < 0x7550700)))))
return -EOPNOTSUPP;

ret = smu_cmn_send_smc_msg_with_param(smu,
SMU_MSG_ResetSDMA, inst_mask, NULL);
Expand Down

0 comments on commit 875596b

Please sign in to comment.