Commit 0604897b authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher

drm/amd: Fix renoir/green sardine MP0 IP version detection

The existing codebase never had a case for detecting MP0 version on
Renoir and instead relied upon hardcoded chip name.  This was missed as
part of the changes to migrate all IP blocks to build filenames from
`amdgpu_ucode.c`.

Consequently, Renoir tries to fetch a binary with 11_0_3 in the filename
and since it's supposed to have "renoir" in the filename fails to probe.
The fbdev still works though so the series worked.

Add a case for Renoir into the legacy table to ensure the right ASD and
TA firmware load again.
Reported-by: default avatarEkene Akuneme <Ekene.Akuneme@amd.com>
Reported-by: default avatarNicholas Choi <Nicholas.Choi@amd.com>
Cc: Alex Hung <Alex.Hung@amd.com>
Fixes: 994a9744 ("drm/amd: Parse both v1 and v2 TA microcode headers using same function")
Fixes: 54a3e032 ("drm/amd: Add a legacy mapping to "amdgpu_ucode_ip_version_decode"")
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73b1a771
...@@ -1087,6 +1087,8 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl ...@@ -1087,6 +1087,8 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
return "navi10"; return "navi10";
case IP_VERSION(11, 0, 2): case IP_VERSION(11, 0, 2):
return "vega20"; return "vega20";
case IP_VERSION(11, 0, 3):
return "renoir";
case IP_VERSION(11, 0, 4): case IP_VERSION(11, 0, 4):
return "arcturus"; return "arcturus";
case IP_VERSION(11, 0, 5): case IP_VERSION(11, 0, 5):
...@@ -1104,12 +1106,7 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl ...@@ -1104,12 +1106,7 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
return "vangogh"; return "vangogh";
case IP_VERSION(12, 0, 1): case IP_VERSION(12, 0, 1):
if (adev->asic_type == CHIP_RENOIR) {
if (adev->apu_flags & AMD_APU_IS_RENOIR)
return "renoir";
return "green_sardine"; return "green_sardine";
}
break;
case IP_VERSION(13, 0, 2): case IP_VERSION(13, 0, 2):
return "aldebaran"; return "aldebaran";
case IP_VERSION(13, 0, 1): case IP_VERSION(13, 0, 1):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment