* [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1
@ 2022-05-03 20:50 Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add soc21 common ip block support for GC 11.0.1 Alex Deucher
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:50 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add the mmhub support for MMHUB 3.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
index 682d7842aea1..bc11b2de37ae 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
@@ -109,6 +109,7 @@ mmhub_v3_0_print_l2_protection_fault_status(struct amdgpu_device *adev,
status);
switch (adev->ip_versions[MMHUB_HWIP][0]) {
case IP_VERSION(3, 0, 0):
+ case IP_VERSION(3, 0, 1):
mmhub_cid = mmhub_client_ids_v3_0_0[cid][rw];
break;
default:
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: add soc21 common ip block support for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
@ 2022-05-03 20:50 ` Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu/discovery: enable soc21 common " Alex Deucher
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:50 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add common soc21 ip block support for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/soc21.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 9424020c0634..cfe5d12b180b 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -564,6 +564,11 @@ static int soc21_common_early_init(void *handle)
AMD_PG_SUPPORT_MMHUB;
adev->external_rev_id = adev->rev_id + 0x10;
break;
+ case IP_VERSION(11, 0, 1):
+ adev->cg_flags = 0;
+ adev->pg_flags = 0;
+ adev->external_rev_id = adev->rev_id + 0x1;
+ break;
default:
/* FIXME: not supported yet */
return -EINVAL;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: enable soc21 common for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add soc21 common ip block support for GC 11.0.1 Alex Deucher
@ 2022-05-03 20:50 ` Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add gmc v11 support " Alex Deucher
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:50 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Enable soc21 common for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 50cf5c27f3b1..8f5c203c3c87 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1481,6 +1481,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &nv_common_ip_block);
break;
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
amdgpu_device_ip_block_add(adev, &soc21_common_ip_block);
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: add gmc v11 support for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add soc21 common ip block support for GC 11.0.1 Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu/discovery: enable soc21 common " Alex Deucher
@ 2022-05-03 20:50 ` Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu/discovery: enable gmc v11 " Alex Deucher
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:50 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add gmc v11 support for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
index 2f3debbb1a52..84593414bf25 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
@@ -747,6 +747,7 @@ static int gmc_v11_0_sw_init(void *handle)
switch (adev->ip_versions[GC_HWIP][0]) {
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
adev->num_vmhubs = 2;
/*
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: enable gmc v11 for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (2 preceding siblings ...)
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add gmc v11 support " Alex Deucher
@ 2022-05-03 20:50 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable ih v6 for OSS 6.0.1 Alex Deucher
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:50 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Enable gmc (graphic memory controller) v11 for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 8f5c203c3c87..90895b1af5c2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1524,6 +1524,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);
break;
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
amdgpu_device_ip_block_add(adev, &gmc_v11_0_ip_block);
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: enable ih v6 for OSS 6.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (3 preceding siblings ...)
2022-05-03 20:50 ` [PATCH] drm/amdgpu/discovery: enable gmc v11 " Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: add PSP v13.0.4 into the IP discovery list Alex Deucher
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Enable ih (interrupt handler) v6 for OSS 6.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 90895b1af5c2..2ef93c8c63d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1561,6 +1561,7 @@ static int amdgpu_discovery_set_ih_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
break;
case IP_VERSION(6, 0, 0):
+ case IP_VERSION(6, 0, 1):
case IP_VERSION(6, 0, 2):
amdgpu_device_ip_block_add(adev, &ih_v6_0_ip_block);
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: add PSP v13.0.4 into the IP discovery list
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (4 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable ih v6 for OSS 6.0.1 Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add sdma support for sdma 6.0.1 Alex Deucher
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Xiaojian Du
From: Xiaojian Du <Xiaojian.Du@amd.com>
This patch will add PSP v13.0.4 into the IP discovery list.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 2ef93c8c63d7..2c742d46a837 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1607,6 +1607,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(13, 0, 1):
case IP_VERSION(13, 0, 2):
case IP_VERSION(13, 0, 3):
+ case IP_VERSION(13, 0, 4):
case IP_VERSION(13, 0, 5):
case IP_VERSION(13, 0, 7):
case IP_VERSION(13, 0, 8):
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: add sdma support for sdma 6.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (5 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: add PSP v13.0.4 into the IP discovery list Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable sdma v6 for SDMA 6.0.1 Alex Deucher
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add sdma 6.0.1 support to sdma6 implementation.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 7650c1e530a3..6cc6a81a7d73 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -45,6 +45,7 @@
#include "v11_structs.h"
MODULE_FIRMWARE("amdgpu/sdma_6_0_0.bin");
+MODULE_FIRMWARE("amdgpu/sdma_6_0_1.bin");
MODULE_FIRMWARE("amdgpu/sdma_6_0_2.bin");
#define SDMA1_REG_OFFSET 0x600
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: enable sdma v6 for SDMA 6.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (6 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add sdma support for sdma 6.0.1 Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add GC 11.0.1 family id Alex Deucher
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Enable sdma (system dma) v6 for SDMA 6.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 2c742d46a837..3931c1af2b2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1791,6 +1791,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block);
break;
case IP_VERSION(6, 0, 0):
+ case IP_VERSION(6, 0, 1):
case IP_VERSION(6, 0, 2):
amdgpu_device_ip_block_add(adev, &sdma_v6_0_ip_block);
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: add GC 11.0.1 family id
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (7 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable sdma v6 for SDMA 6.0.1 Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: set GC 11.0.1 family Alex Deucher
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add a flag to define GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
include/uapi/drm/amdgpu_drm.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 992851219441..9a1d210d135d 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -1152,6 +1152,7 @@ struct drm_amdgpu_info_video_caps {
#define AMDGPU_FAMILY_VGH 144 /* Van Gogh */
#define AMDGPU_FAMILY_GC_11_0_0 145 /* GC 11.0.0 */
#define AMDGPU_FAMILY_YC 146 /* Yellow Carp */
+#define AMDGPU_FAMILY_GC_11_0_1 148 /* GC 11.0.1 */
#define AMDGPU_FAMILY_GC_10_3_6 149 /* GC 10.3.6 */
#define AMDGPU_FAMILY_GC_10_3_7 151 /* GC 10.3.7 */
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: set GC 11.0.1 family
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (8 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add GC 11.0.1 family id Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: set flag for GC 11.0.1 Alex Deucher
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add GC 11.0.1 family support.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
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 3931c1af2b2a..5c6d8a68c540 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2135,6 +2135,9 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 2):
adev->family = AMDGPU_FAMILY_GC_11_0_0;
break;
+ case IP_VERSION(11, 0, 1):
+ adev->family = AMDGPU_FAMILY_GC_11_0_1;
+ break;
default:
return -EINVAL;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: set flag for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (9 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu: set GC 11.0.1 family Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add gfx support " Alex Deucher
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Set the APU flag appropriately for GC 11.0.1.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 5c6d8a68c540..8621e30b52ba 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2152,6 +2152,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(10, 3, 3):
case IP_VERSION(10, 3, 6):
case IP_VERSION(10, 3, 7):
+ case IP_VERSION(11, 0, 1):
adev->flags |= AMD_IS_APU;
break;
default:
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: add gfx support for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (10 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: set flag for GC 11.0.1 Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add GC v11.0.1 into mes v11 Alex Deucher
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Add GC 11.0.1 gfx support to gfx11 implementation.
v2: squash in golden regs
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 85fddec0d4ba..fc3df3630c63 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -54,11 +54,18 @@
#define RLCG_UCODE_LOADING_START_ADDRESS 0x00002000L
+#define regCGTT_WD_CLK_CTRL 0x5086
+#define regCGTT_WD_CLK_CTRL_BASE_IDX 1
+
MODULE_FIRMWARE("amdgpu/gc_11_0_0_pfp.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_0_me.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_0_mec.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_0_rlc.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_0_toc.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_pfp.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_me.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_mec.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_rlc.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_2_pfp.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_2_me.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_2_mec.bin");
@@ -79,6 +86,19 @@ static const struct soc15_reg_golden golden_settings_gc_rlc_spm_11_0[] =
/* Pending on emulation bring up */
};
+static const struct soc15_reg_golden golden_settings_gc_11_0_1[] =
+{
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regCGTT_GS_NGG_CLK_CTRL, 0x9fff8fff, 0x00000010),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regCGTT_WD_CLK_CTRL, 0xffff8fff, 0x00000010),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regCPF_GCR_CNTL, 0x0007ffff, 0x0000c200),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regGL2C_CTRL3, 0xffff001b, 0x00f01988),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regPA_CL_ENHANCE, 0xf0ffffff, 0x00880007),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regPA_SC_ENHANCE_3, 0xfffffffd, 0x00000008),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regPA_SC_VRS_SURFACE_CNTL_1, 0xfff891ff, 0x55480100),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regTA_CNTL_AUX, 0xf7f7ffff, 0x01030000),
+ SOC15_REG_GOLDEN_VALUE(GC, 0, regTCP_CNTL2, 0xfcffffff, 0x0000000a)
+};
+
#define DEFAULT_SH_MEM_CONFIG \
((SH_MEM_ADDRESS_MODE_64 << SH_MEM_CONFIG__ADDRESS_MODE__SHIFT) | \
(SH_MEM_ALIGNMENT_MODE_UNALIGNED << SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT) | \
@@ -263,6 +283,14 @@ static void gfx_v11_0_init_golden_registers(struct amdgpu_device *adev)
golden_settings_gc_11_0_0,
(const u32)ARRAY_SIZE(golden_settings_gc_11_0_0));
break;
+ case IP_VERSION(11, 0, 1):
+ soc15_program_register_sequence(adev,
+ golden_settings_gc_11_0,
+ (const u32)ARRAY_SIZE(golden_settings_gc_11_0));
+ soc15_program_register_sequence(adev,
+ golden_settings_gc_11_0_1,
+ (const u32)ARRAY_SIZE(golden_settings_gc_11_0_1));
+ break;
default:
break;
}
@@ -1133,6 +1161,13 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev)
adev->gfx.config.sc_hiz_tile_fifo_size = 0;
adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;
break;
+ case IP_VERSION(11, 0, 1):
+ adev->gfx.config.max_hw_contexts = 8;
+ adev->gfx.config.sc_prim_fifo_size_frontend = 0x20;
+ adev->gfx.config.sc_prim_fifo_size_backend = 0x100;
+ adev->gfx.config.sc_hiz_tile_fifo_size = 0x80;
+ adev->gfx.config.sc_earlyz_tile_fifo_size = 0x300;
+ break;
default:
BUG();
break;
@@ -1553,6 +1588,7 @@ static int gfx_v11_0_sw_init(void *handle)
switch (adev->ip_versions[GC_HWIP][0]) {
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
adev->gfx.me.num_me = 1;
adev->gfx.me.num_pipe_per_me = 1;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: add GC v11.0.1 into mes v11
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (11 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add gfx support " Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdkfd: add GC 11.0.1 KFD support Alex Deucher
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Xiaojian Du
From: Huang Rui <ray.huang@amd.com>
Add GC v11.0.1 support into mes v11.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Xiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index 8af935930f89..840f66457ffe 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -34,6 +34,8 @@
MODULE_FIRMWARE("amdgpu/gc_11_0_0_mes.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_0_mes1.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_mes.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_mes1.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes1.bin");
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdkfd: add GC 11.0.1 KFD support
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (12 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add GC v11.0.1 into mes v11 Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: enable imu firmware for GC 11.0.1 Alex Deucher
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu, Xiaojian Du
From: Huang Rui <ray.huang@amd.com>
Add initial support for GC 11.0.1 in KFD compute driver.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index 765602a2cb47..5e9adbc71bbd 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -1520,6 +1520,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
num_of_cache_types = ARRAY_SIZE(yellow_carp_cache_info);
break;
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
pcache_info = cache_info;
num_of_cache_types =
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index ad41e6018ccd..f1a225a20719 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -73,6 +73,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
case IP_VERSION(4, 1, 2):/* RENOIR */
case IP_VERSION(5, 2, 1):/* VANGOGH */
case IP_VERSION(5, 2, 3):/* YELLOW_CARP */
+ case IP_VERSION(6, 0, 1):
kfd->device_info.num_sdma_queues_per_engine = 2;
break;
case IP_VERSION(4, 2, 0):/* VEGA20 */
@@ -99,6 +100,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
switch (sdma_version) {
case IP_VERSION(6, 0, 0):
+ case IP_VERSION(6, 0, 1):
case IP_VERSION(6, 0, 2):
/* Reserve 1 for paging and 1 for gfx */
kfd->device_info.num_reserved_sdma_queues_per_engine = 2;
@@ -137,6 +139,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)
kfd->device_info.event_interrupt_class = &event_interrupt_class_v9;
break;
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;
break;
@@ -369,6 +372,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
gfx_target_version = 110000;
f2g = &gfx_v11_kfd2kgd;
break;
+ case IP_VERSION(11, 0, 1):
+ gfx_target_version = 110003;
+ f2g = &gfx_v11_kfd2kgd;
+ break;
case IP_VERSION(11, 0, 2):
gfx_target_version = 110002;
f2g = &gfx_v11_kfd2kgd;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu: enable imu firmware for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (13 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdkfd: add GC 11.0.1 KFD support Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable gfx v11 " Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable mes support for GC v11.0.1 Alex Deucher
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Tim Huang, Huang Rui
From: Huang Rui <ray.huang@amd.com>
The GC 11.0.1 needs load IMU to power up the GFX before loads GFX
firmware.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Tim Huang <Tim.Huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
index b1964cc26aee..5d2dfeff8fe5 100644
--- a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
@@ -29,6 +29,7 @@
#include "gc/gc_11_0_0_sh_mask.h"
MODULE_FIRMWARE("amdgpu/gc_11_0_0_imu.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_1_imu.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_2_imu.bin");
static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: enable gfx v11 for GC 11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (14 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu: enable imu firmware for GC 11.0.1 Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable mes support for GC v11.0.1 Alex Deucher
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Aaron Liu
From: Huang Rui <ray.huang@amd.com>
Enable gfx v11 for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 8621e30b52ba..9c44b2250a3c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1749,6 +1749,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
break;
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
amdgpu_device_ip_block_add(adev, &gfx_v11_0_ip_block);
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] drm/amdgpu/discovery: enable mes support for GC v11.0.1
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
` (15 preceding siblings ...)
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable gfx v11 " Alex Deucher
@ 2022-05-03 20:51 ` Alex Deucher
16 siblings, 0 replies; 18+ messages in thread
From: Alex Deucher @ 2022-05-03 20:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Xiaojian Du
From: Huang Rui <ray.huang@amd.com>
GC v11.0.1 is using MES v11, so add IP block.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Xiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 9c44b2250a3c..263fedadbf5b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1908,6 +1908,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)
}
break;
case IP_VERSION(11, 0, 0):
+ case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
amdgpu_device_ip_block_add(adev, &mes_v11_0_ip_block);
adev->enable_mes = true;
--
2.35.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-05-03 20:51 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-03 20:50 [PATCH] drm/amdgpu: add mmhub support for MMHUB 3.0.1 Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add soc21 common ip block support for GC 11.0.1 Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu/discovery: enable soc21 common " Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu: add gmc v11 support " Alex Deucher
2022-05-03 20:50 ` [PATCH] drm/amdgpu/discovery: enable gmc v11 " Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable ih v6 for OSS 6.0.1 Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: add PSP v13.0.4 into the IP discovery list Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add sdma support for sdma 6.0.1 Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable sdma v6 for SDMA 6.0.1 Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add GC 11.0.1 family id Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: set GC 11.0.1 family Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: set flag for GC 11.0.1 Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add gfx support " Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: add GC v11.0.1 into mes v11 Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdkfd: add GC 11.0.1 KFD support Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu: enable imu firmware for GC 11.0.1 Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable gfx v11 " Alex Deucher
2022-05-03 20:51 ` [PATCH] drm/amdgpu/discovery: enable mes support for GC v11.0.1 Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).