[PATCH 2/2] drm/amd/amdgpu: add support for IP version 11.5.2

[Mario Limonciello]

On 2/7/2025 15:27, Ying Li wrote:
> This initializes drm/amd/amdgpu version 11.5.2
> 
> Signed-off-by: YING LI <yingli12 at amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 3 +++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c       | 1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c     | 1 +
>   drivers/gpu/drm/amd/amdgpu/nv.c               | 1 +
>   drivers/gpu/drm/amd/amdgpu/psp_v11_0.c        | 1 +
>   5 files changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index eca431e52038..8db1b221f30c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -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, 13):
>   	case IP_VERSION(11, 5, 0):
> +	case IP_VERSION(11, 5, 2):
>   		amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
>   		break;
>   	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, 13):
>   	case IP_VERSION(11, 5, 0):
> +	case IP_VERSION(11, 5, 2):
>   		amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
>   		break;
>   	case IP_VERSION(12, 0, 0):
> @@ -2930,6 +2932,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>   	case IP_VERSION(11, 0, 10):
>   	case IP_VERSION(11, 0, 11):
>   	case IP_VERSION(11, 5, 0):
> +	case IP_VERSION(11, 5, 2):
>   	case IP_VERSION(13, 0, 1):
>   	case IP_VERSION(13, 0, 9):
>   	case IP_VERSION(13, 0, 10):
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index b531adfb4f57..a221165f239a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -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, 11):
>   	case IP_VERSION(11, 5, 0):
> +	case IP_VERSION(11, 5, 2):
>   	case IP_VERSION(11, 0, 12):
>   	case IP_VERSION(11, 0, 13):
>   		psp_v11_0_set_psp_funcs(psp);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index cf700824b960..3d9e9fdc10b4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -1216,6 +1216,7 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
>   		case IP_VERSION(11, 0, 13):
>   			return "beige_goby";
>   		case IP_VERSION(11, 5, 0):
> +		case IP_VERSION(11, 5, 2):
>   			return "vangogh";
>   		case IP_VERSION(12, 0, 1):
>   			return "green_sardine";
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 47db483c3516..8d84dff58b7e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -454,6 +454,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)
>   
>   	switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
>   	case IP_VERSION(11, 5, 0):
> +	case IP_VERSION(11, 5, 2):
>   	case IP_VERSION(13, 0, 1):
>   	case IP_VERSION(13, 0, 3):
>   	case IP_VERSION(13, 0, 5):
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index 2395f1856962..bb5dfc410a66 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -129,6 +129,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
>   		err = psp_init_ta_microcode(psp, ucode_prefix);
>   		break;
>   	case IP_VERSION(11, 5, 0):
> +	case IP_VERSION(11, 5, 2):
>   		err = psp_init_asd_microcode(psp, ucode_prefix);
>   		if (err)
>   			return err;