Skip to contentSkip to conversation

drm/amdgpu: add new AMDGPU_FAMILY definition

PATCH New Alex Deucher 1 participant 3 messages Aug 16, 2023

Subsystems (3)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/3 drm/amdgpu: add new AMDGPU_FAMILY definition

From: Prike Liang <[email protected]>

add GC 11.5.0 family

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 ++++
 include/uapi/drm/amdgpu_drm.h                 | 1 +
 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +4 -0
index 9d8d08daca57..ed92f28a9171 100644
@@ -2342,6 +2342,9 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
 	case IP_VERSION(11, 0, 4):
 		adev->family = AMDGPU_FAMILY_GC_11_0_1;
 		break;
+	case IP_VERSION(11, 5, 0):
+		adev->family = AMDGPU_FAMILY_GC_11_5_0;
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -2358,6 +2361,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
 	case IP_VERSION(10, 3, 7):
 	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 4):
+	case IP_VERSION(11, 5, 0):
 		adev->flags |= AMD_IS_APU;
 		break;
 	default:
include/uapi/drm/amdgpu_drm.h +1 -0
index f477eda6a2b8..5f5ffdac1556 100644
@@ -1238,6 +1238,7 @@ struct drm_amdgpu_info_video_caps {
 #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 */
+#define AMDGPU_FAMILY_GC_11_5_0			150 /* GC 11.5.0 */
 
 #if defined(__cplusplus)
 }
Signature · 1 line
2.41.0
author maintainer
#1 lore raw

PATCH 2/3 drm/amdgpu/soc21: add initial GC 11.5.0 soc21 support

From: Prike Liang <[email protected]>

Disable clock gating and power gating on the early bring up phase.

---
 drivers/gpu/drm/amd/amdgpu/soc21.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +6 -0
index 40d23738ee4e..a920bcb9f5b3 100644
@@ -688,6 +688,12 @@ static int soc21_common_early_init(void *handle)
 		adev->external_rev_id = adev->rev_id + 0x80;
 		break;
 
+
+	case IP_VERSION(11, 5, 0):
+		adev->cg_flags = 0;
+		adev->pg_flags = 0;
+		adev->external_rev_id = adev->rev_id + 0x1;
+		break;
 	default:
 		/* FIXME: not supported yet */
 		return -EINVAL;
Signature · 1 line
2.41.0
author maintainer
#2 lore raw

PATCH 3/3 drm/amdgpu/discovery: enable soc21 support

In reply to Alex Deucher

From: Prike Liang <[email protected]>

Add 11.5.0 to IP discovery table.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
index ed92f28a9171..704f97116119 100644
@@ -1617,6 +1617,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)
 	case IP_VERSION(11, 0, 2):
 	case IP_VERSION(11, 0, 3):
 	case IP_VERSION(11, 0, 4):
+	case IP_VERSION(11, 5, 0):
 		amdgpu_device_ip_block_add(adev, &soc21_common_ip_block);
 		break;
 	default:
Signature · 1 line
2.41.0