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

[Luben Tuikov]

Series is:

Reviewed-by: Luben Tuikov <luben.tuikov at amd.com>


On 2021-10-26 10:45, Alex Deucher wrote:
> Add secondary instance version info for soc15 parts.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 44b0821b6ca3..d7c8d9e3c203 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -931,6 +931,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>  		adev->ip_versions[OSSSYS_HWIP][0] = IP_VERSION(4, 0, 0);
>  		adev->ip_versions[HDP_HWIP][0] = IP_VERSION(4, 0, 0);
>  		adev->ip_versions[SDMA0_HWIP][0] = IP_VERSION(4, 0, 0);
> +		adev->ip_versions[SDMA1_HWIP][0] = IP_VERSION(4, 0, 0);
>  		adev->ip_versions[DF_HWIP][0] = IP_VERSION(2, 1, 0);
>  		adev->ip_versions[NBIO_HWIP][0] = IP_VERSION(6, 1, 0);
>  		adev->ip_versions[UMC_HWIP][0] = IP_VERSION(6, 0, 0);
> @@ -951,6 +952,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>  		adev->ip_versions[OSSSYS_HWIP][0] = IP_VERSION(4, 0, 1);
>  		adev->ip_versions[HDP_HWIP][0] = IP_VERSION(4, 0, 1);
>  		adev->ip_versions[SDMA0_HWIP][0] = IP_VERSION(4, 0, 1);
> +		adev->ip_versions[SDMA1_HWIP][0] = IP_VERSION(4, 0, 1);
>  		adev->ip_versions[DF_HWIP][0] = IP_VERSION(2, 5, 0);
>  		adev->ip_versions[NBIO_HWIP][0] = IP_VERSION(6, 2, 0);
>  		adev->ip_versions[UMC_HWIP][0] = IP_VERSION(6, 1, 0);
> @@ -1009,6 +1011,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>  		adev->ip_versions[OSSSYS_HWIP][0] = IP_VERSION(4, 2, 0);
>  		adev->ip_versions[HDP_HWIP][0] = IP_VERSION(4, 2, 0);
>  		adev->ip_versions[SDMA0_HWIP][0] = IP_VERSION(4, 2, 0);
> +		adev->ip_versions[SDMA1_HWIP][0] = IP_VERSION(4, 2, 0);
>  		adev->ip_versions[DF_HWIP][0] = IP_VERSION(3, 6, 0);
>  		adev->ip_versions[NBIO_HWIP][0] = IP_VERSION(7, 4, 0);
>  		adev->ip_versions[UMC_HWIP][0] = IP_VERSION(6, 1, 1);
> @@ -1031,6 +1034,13 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>  		adev->ip_versions[OSSSYS_HWIP][0] = IP_VERSION(4, 2, 1);
>  		adev->ip_versions[HDP_HWIP][0] = IP_VERSION(4, 2, 1);
>  		adev->ip_versions[SDMA0_HWIP][0] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][0] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][1] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][2] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][3] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][4] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][5] = IP_VERSION(4, 2, 2);
> +		adev->ip_versions[SDMA1_HWIP][6] = IP_VERSION(4, 2, 2);
>  		adev->ip_versions[DF_HWIP][0] = IP_VERSION(3, 6, 1);
>  		adev->ip_versions[NBIO_HWIP][0] = IP_VERSION(7, 4, 1);
>  		adev->ip_versions[UMC_HWIP][0] = IP_VERSION(6, 1, 2);
> @@ -1051,6 +1061,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>  		adev->ip_versions[OSSSYS_HWIP][0] = IP_VERSION(4, 4, 0);
>  		adev->ip_versions[HDP_HWIP][0] = IP_VERSION(4, 4, 0);
>  		adev->ip_versions[SDMA0_HWIP][0] = IP_VERSION(4, 4, 0);
> +		adev->ip_versions[SDMA0_HWIP][1] = IP_VERSION(4, 4, 0);
> +		adev->ip_versions[SDMA0_HWIP][2] = IP_VERSION(4, 4, 0);
> +		adev->ip_versions[SDMA0_HWIP][3] = IP_VERSION(4, 4, 0);
> +		adev->ip_versions[SDMA0_HWIP][4] = IP_VERSION(4, 4, 0);
>  		adev->ip_versions[DF_HWIP][0] = IP_VERSION(3, 6, 2);
>  		adev->ip_versions[NBIO_HWIP][0] = IP_VERSION(7, 4, 4);
>  		adev->ip_versions[UMC_HWIP][0] = IP_VERSION(6, 7, 0);