Skip to contentSkip to conversation

lib/amdgpu: add gfx12 family id

PATCH In review Jesse Zhang 2 participants 2 messages Jun 21, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 lib/amdgpu: add gfx12 family id

To support gfx12 testing, add its family ID.
V2: using a unique subject (Kamil)

---
 lib/amdgpu/amd_family.h       | 1 +
 lib/amdgpu/amd_ip_blocks.c    | 3 +++
 lib/amdgpu/amdgpu_asic_addr.h | 3 +++
 3 files changed, 7 insertions(+)
lib/amdgpu/amd_family.h +1 -0
index bce2c6c2e..4a5731dbf 100644
@@ -106,6 +106,7 @@ enum radeon_family {
 	CHIP_GFX1103_R2,
 	CHIP_GFX1150,
 	CHIP_GFX1151,
+	CHIP_GFX1200,
 	CHIP_LAST,
 };
 
lib/amdgpu/amd_ip_blocks.c +3 -0
index 2ee94105c..ff7e55525 100644
@@ -695,6 +695,9 @@ int setup_amdgpu_ip_blocks(uint32_t major, uint32_t minor, struct amdgpu_gpu_inf
 		identify_chip(GFX1150);
 		identify_chip(GFX1151);
 		break;
+	case FAMILY_GFX1200:
+		identify_chip(GFX1200);
+		break;
 	}
 	if (!info->name) {
 		igt_info("amdgpu: unknown (family_id, chip_external_rev): (%u, %u)\n",
lib/amdgpu/amdgpu_asic_addr.h +3 -0
index cbe02871e..0ecb0b803 100644
@@ -31,6 +31,7 @@
 #define FAMILY_GFX1036 0x95
 #define FAMILY_GFX1150 0x96
 #define FAMILY_GFX1037 0x97
+#define FAMILY_GFX1200 0x98
 
 // AMDGPU_FAMILY_IS(familyId, familyName)
 #define FAMILY_IS(f, fn)     (f == FAMILY_##fn)
@@ -108,6 +109,7 @@
 #define AMDGPU_GFX1103_R2_RANGE  0x80, 0xFF //# 128 <= x < max
 #define AMDGPU_GFX1150_RANGE     0x01, 0xc0 //# 01 <= x < c0
 #define AMDGPU_GFX1151_RANGE     0xc1, 0xFF //# c1 <= x < 255
+#define AMDGPU_GFX1200_RANGE     0x01, 0xFF //# 01 <= x < 255
 
 #define AMDGPU_EXPAND_FIX(x) x
 #define AMDGPU_RANGE_HELPER(val, min, max) ((val >= min) && (val < max))
@@ -173,5 +175,6 @@
 #define ASICREV_IS_GFX1103_R2(r)       ASICREV_IS(r, GFX1103_R2)
 #define ASICREV_IS_GFX1150(r)          ASICREV_IS(r, GFX1150)
 #define ASICREV_IS_GFX1151(r)          ASICREV_IS(r, GFX1151)
+#define ASICREV_IS_GFX1200(r)          ASICREV_IS(r, GFX1200)
 
 #endif // _AMDGPU_ASIC_ADDR_H
Signature · 1 line
2.25.1
Reviewed-by on v2 1/3
#1 lore raw

Looks good to me.

Quoted 63 lines · Jesse Zhang

To support gfx12 testing, add its family ID.
V2: using a unique subject (Kamil)

---
 lib/amdgpu/amd_family.h       | 1 +
 lib/amdgpu/amd_ip_blocks.c    | 3 +++
 lib/amdgpu/amdgpu_asic_addr.h | 3 +++
 3 files changed, 7 insertions(+)
lib/amdgpu/amd_family.h +1 -0
index bce2c6c2e..4a5731dbf 100644
@@ -106,6 +106,7 @@ enum radeon_family {
 	CHIP_GFX1103_R2,
 	CHIP_GFX1150,
 	CHIP_GFX1151,
+	CHIP_GFX1200,
 	CHIP_LAST,
 };
 
lib/amdgpu/amd_ip_blocks.c +3 -0
index 2ee94105c..ff7e55525 100644
@@ -695,6 +695,9 @@ int setup_amdgpu_ip_blocks(uint32_t major, uint32_t minor, struct amdgpu_gpu_inf
 		identify_chip(GFX1150);
 		identify_chip(GFX1151);
 		break;
+	case FAMILY_GFX1200:
+		identify_chip(GFX1200);
+		break;
 	}
 	if (!info->name) {
 		igt_info("amdgpu: unknown (family_id, chip_external_rev): (%u, %u)\n",
lib/amdgpu/amdgpu_asic_addr.h +3 -0
index cbe02871e..0ecb0b803 100644
@@ -31,6 +31,7 @@
 #define FAMILY_GFX1036 0x95
 #define FAMILY_GFX1150 0x96
 #define FAMILY_GFX1037 0x97
+#define FAMILY_GFX1200 0x98
 
 // AMDGPU_FAMILY_IS(familyId, familyName)
 #define FAMILY_IS(f, fn)     (f == FAMILY_##fn)
@@ -108,6 +109,7 @@
 #define AMDGPU_GFX1103_R2_RANGE  0x80, 0xFF //# 128 <= x < max
 #define AMDGPU_GFX1150_RANGE     0x01, 0xc0 //# 01 <= x < c0
 #define AMDGPU_GFX1151_RANGE     0xc1, 0xFF //# c1 <= x < 255
+#define AMDGPU_GFX1200_RANGE     0x01, 0xFF //# 01 <= x < 255
 
 #define AMDGPU_EXPAND_FIX(x) x
 #define AMDGPU_RANGE_HELPER(val, min, max) ((val >= min) && (val < max))
@@ -173,5 +175,6 @@
 #define ASICREV_IS_GFX1103_R2(r)       ASICREV_IS(r, GFX1103_R2)
 #define ASICREV_IS_GFX1150(r)          ASICREV_IS(r, GFX1150)
 #define ASICREV_IS_GFX1151(r)          ASICREV_IS(r, GFX1151)
+#define ASICREV_IS_GFX1200(r)          ASICREV_IS(r, GFX1200)
 
 #endif // _AMDGPU_ASIC_ADDR_H