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

AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts
@ 2021-10-26 14:45 Alex Deucher
  2021-10-26 14:45 ` [PATCH 2/2] drm/amdgpu/discovery: add SDMA " Alex Deucher
  2021-10-27  7:12 ` [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN " Christian König
  0 siblings, 2 replies; 4+ messages in thread
From: Alex Deucher @ 2021-10-26 14:45 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Add secondary instance version info for vega20, arcturure, and
aldebaran.

Signed-off-by: Alex Deucher <alexander.deucher@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:
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] drm/amdgpu/discovery: add SDMA IP instance info for soc15 parts
  2021-10-26 14:45 [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts Alex Deucher
@ 2021-10-26 14:45 ` Alex Deucher
  2021-10-26 20:46   ` Luben Tuikov
  2021-10-27  7:12 ` [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN " Christian König
  1 sibling, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2021-10-26 14:45 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Add secondary instance version info for soc15 parts.

Signed-off-by: Alex Deucher <alexander.deucher@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);
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] drm/amdgpu/discovery: add SDMA IP instance info for soc15 parts
  2021-10-26 14:45 ` [PATCH 2/2] drm/amdgpu/discovery: add SDMA " Alex Deucher
@ 2021-10-26 20:46   ` Luben Tuikov
  0 siblings, 0 replies; 4+ messages in thread
From: Luben Tuikov @ 2021-10-26 20:46 UTC (permalink / raw)
  To: Alex Deucher, amd-gfx

Series is:

Reviewed-by: Luben Tuikov <luben.tuikov@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@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);


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts
  2021-10-26 14:45 [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts Alex Deucher
  2021-10-26 14:45 ` [PATCH 2/2] drm/amdgpu/discovery: add SDMA " Alex Deucher
@ 2021-10-27  7:12 ` Christian König
  1 sibling, 0 replies; 4+ messages in thread
From: Christian König @ 2021-10-27  7:12 UTC (permalink / raw)
  To: Alex Deucher, amd-gfx

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@amd.com>

Acked-by: Christian König <christian.koenig@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:


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-10-27  7:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-26 14:45 [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts Alex Deucher
2021-10-26 14:45 ` [PATCH 2/2] drm/amdgpu/discovery: add SDMA " Alex Deucher
2021-10-26 20:46   ` Luben Tuikov
2021-10-27  7:12 ` [PATCH 1/2] drm/amdgpu/discovery: add UVD/VCN " Christian König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox