[PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts

[Christian König]

Am 26.10.21 um 16:45 schrieb Alex Deucher:
> Add secondary instance version info for vega20, arcturure, and
> aldebaran.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Acked-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 208a784475bd..44b0821b6ca3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -1018,6 +1018,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>   		adev->ip_versions[SMUIO_HWIP][0] = IP_VERSION(11, 0, 2);
>   		adev->ip_versions[GC_HWIP][0] = IP_VERSION(9, 4, 0);
>   		adev->ip_versions[UVD_HWIP][0] = IP_VERSION(7, 2, 0);
> +		adev->ip_versions[UVD_HWIP][1] = IP_VERSION(7, 2, 0);
>   		adev->ip_versions[VCE_HWIP][0] = IP_VERSION(4, 1, 0);
>   		adev->ip_versions[DCI_HWIP][0] = IP_VERSION(12, 1, 0);
>   		break;
> @@ -1039,6 +1040,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>   		adev->ip_versions[SMUIO_HWIP][0] = IP_VERSION(11, 0, 3);
>   		adev->ip_versions[GC_HWIP][0] = IP_VERSION(9, 4, 1);
>   		adev->ip_versions[UVD_HWIP][0] = IP_VERSION(2, 5, 0);
> +		adev->ip_versions[UVD_HWIP][1] = IP_VERSION(2, 5, 0);
>   		break;
>   	case CHIP_ALDEBARAN:
>   		aldebaran_reg_base_init(adev);
> @@ -1058,6 +1060,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>   		adev->ip_versions[SMUIO_HWIP][0] = IP_VERSION(13, 0, 2);
>   		adev->ip_versions[GC_HWIP][0] = IP_VERSION(9, 4, 2);
>   		adev->ip_versions[UVD_HWIP][0] = IP_VERSION(2, 6, 0);
> +		adev->ip_versions[UVD_HWIP][1] = IP_VERSION(2, 6, 0);
>   		adev->ip_versions[XGMI_HWIP][0] = IP_VERSION(6, 1, 0);
>   		break;
>   	default: