torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

drm/amd/amdgpu: add support for IP version 11.5.2

Browse Source 
This initializes drm/amd/amdgpu version 11.5.2

Signed-off-by: YING LI <yingli12@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Ying Li 2025-02-11 11:53:19 -05:00 committed by Alex Deucher
parent ee9e64549f
commit 16a5a8fe6f
5 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
View File

@ -2020,6 +2020,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 12): case IP_VERSION(11, 0, 12):
case IP_VERSION(11, 0, 13): case IP_VERSION(11, 0, 13):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
break; break;
case IP_VERSION(11, 0, 8): case IP_VERSION(11, 0, 8):
@ -2084,6 +2085,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 12): case IP_VERSION(11, 0, 12):
case IP_VERSION(11, 0, 13): case IP_VERSION(11, 0, 13):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
break; break;
case IP_VERSION(12, 0, 0): case IP_VERSION(12, 0, 0):
@ -2931,6 +2933,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 10): case IP_VERSION(11, 0, 10):
case IP_VERSION(11, 0, 11): case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
case IP_VERSION(13, 0, 1): case IP_VERSION(13, 0, 1):
case IP_VERSION(13, 0, 9): case IP_VERSION(13, 0, 9):
case IP_VERSION(13, 0, 10): case IP_VERSION(13, 0, 10):

1
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
View File

@ -193,6 +193,7 @@ static int psp_early_init(struct amdgpu_ip_block *ip_block)
case IP_VERSION(11, 0, 9): case IP_VERSION(11, 0, 9):
case IP_VERSION(11, 0, 11): case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
case IP_VERSION(11, 0, 12): case IP_VERSION(11, 0, 12):
case IP_VERSION(11, 0, 13): case IP_VERSION(11, 0, 13):
psp_v11_0_set_psp_funcs(psp); psp_v11_0_set_psp_funcs(psp);

1
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
View File

@ -1216,6 +1216,7 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
case IP_VERSION(11, 0, 13): case IP_VERSION(11, 0, 13):
return "beige_goby"; return "beige_goby";
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
return "vangogh"; return "vangogh";
case IP_VERSION(12, 0, 1): case IP_VERSION(12, 0, 1):
return "green_sardine"; return "green_sardine";

1
drivers/gpu/drm/amd/amdgpu/nv.c
View File

@ -454,6 +454,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)
switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) { switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
case IP_VERSION(13, 0, 1): case IP_VERSION(13, 0, 1):
case IP_VERSION(13, 0, 3): case IP_VERSION(13, 0, 3):
case IP_VERSION(13, 0, 5): case IP_VERSION(13, 0, 5):

1
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
View File

@ -129,6 +129,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
err = psp_init_ta_microcode(psp, ucode_prefix); err = psp_init_ta_microcode(psp, ucode_prefix);
break; break;
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 2):
err = psp_init_asd_microcode(psp, ucode_prefix); err = psp_init_asd_microcode(psp, ucode_prefix);
if (err) if (err)
return err; return err;