From 820e03bd4c39dbfe761b6d6fc7627d0ae8c170a7 Mon Sep 17 00:00:00 2001
From: chen gong <curry.gong@amd.com>
Date: Mon, 7 Jun 2021 17:23:47 +0800
Subject: [PATCH] libhsakmt: add cyan skillfish support

Signed-off-by: chen gong <curry.gong@amd.com>
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Change-Id: Ie26c2e156c9c4e68a6b36fe699adccf3f808b5e7


[ROCm/ROCR-Runtime commit: 860931557c531185cb13debfd64f9070aa123034]
---
 projects/rocr-runtime/src/libhsakmt.h | 19 ++++++++++---------
 projects/rocr-runtime/src/pmc_table.c |  1 +
 projects/rocr-runtime/src/queues.c    |  7 +++++++
 projects/rocr-runtime/src/topology.c  |  6 ++++++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/projects/rocr-runtime/src/libhsakmt.h b/projects/rocr-runtime/src/libhsakmt.h
index a616c822b9..9c08f78230 100644
--- a/projects/rocr-runtime/src/libhsakmt.h
+++ b/projects/rocr-runtime/src/libhsakmt.h
@@ -134,15 +134,16 @@ enum asic_family_type {
 	CHIP_RENOIR,	/* 13 */
 	CHIP_ARCTURUS,	/* 14 */
 	CHIP_NAVI10,	/* 15 */
-	CHIP_NAVI12,	/* 16 */
-	CHIP_NAVI14,	/* 17 */
-	CHIP_SIENNA_CICHLID,	/* 18 */
-	CHIP_NAVY_FLOUNDER,	/* 19 */
-	CHIP_DIMGREY_CAVEFISH,	/* 20 */
-	CHIP_VANGOGH,	/* 21 */
-	CHIP_ALDEBARAN, /* 22 */
-	CHIP_BEIGE_GOBY,	/* 23 */
-	CHIP_YELLOW_CARP, 	/* 24 */
+	CHIP_CYAN_SKILLFISH,	/* 16 */
+	CHIP_NAVI12,	/* 17 */
+	CHIP_NAVI14,	/* 18 */
+	CHIP_SIENNA_CICHLID,	/* 19 */
+	CHIP_NAVY_FLOUNDER,	/* 20 */
+	CHIP_DIMGREY_CAVEFISH,	/* 21 */
+	CHIP_VANGOGH,	/* 22 */
+	CHIP_ALDEBARAN, /* 23 */
+	CHIP_BEIGE_GOBY,	/* 24 */
+	CHIP_YELLOW_CARP, 	/* 25 */
 	CHIP_LAST
 };
 
diff --git a/projects/rocr-runtime/src/pmc_table.c b/projects/rocr-runtime/src/pmc_table.c
index 8697661f3e..3000b95d32 100644
--- a/projects/rocr-runtime/src/pmc_table.c
+++ b/projects/rocr-runtime/src/pmc_table.c
@@ -2135,6 +2135,7 @@ HSAKMT_STATUS get_block_properties(uint32_t node_id,
 	case CHIP_NAVI14:
 	case CHIP_VANGOGH:
 	case CHIP_YELLOW_CARP:
+	case CHIP_CYAN_SKILLFISH:
 		*block = navi_blocks[block_id];
 		break;
 	default:
diff --git a/projects/rocr-runtime/src/queues.c b/projects/rocr-runtime/src/queues.c
index e667f1a1ce..3de137bf40 100644
--- a/projects/rocr-runtime/src/queues.c
+++ b/projects/rocr-runtime/src/queues.c
@@ -157,6 +157,12 @@ const struct device_info navi10_device_info = {
 	.doorbell_size = DOORBELL_SIZE_GFX9,
 };
 
+const struct device_info cyan_skillfish_device_info = {
+	.asic_family = CHIP_CYAN_SKILLFISH,
+	.eop_buffer_size = 4096,
+	.doorbell_size = DOORBELL_SIZE_GFX9,
+};
+
 const struct device_info navi12_device_info = {
 	.asic_family = CHIP_NAVI12,
 	.eop_buffer_size = 4096,
@@ -223,6 +229,7 @@ static const struct device_info *dev_lookup_table[] = {
 	[CHIP_ARCTURUS] = &arcturus_device_info,
 	[CHIP_ALDEBARAN] = &aldebaran_device_info,
 	[CHIP_NAVI10] = &navi10_device_info,
+	[CHIP_CYAN_SKILLFISH] = &cyan_skillfish_device_info,
 	[CHIP_NAVI12] = &navi12_device_info,
 	[CHIP_NAVI14] = &navi14_device_info,
 	[CHIP_SIENNA_CICHLID] = &sienna_cichlid_device_info,
diff --git a/projects/rocr-runtime/src/topology.c b/projects/rocr-runtime/src/topology.c
index 3761c4f076..55d567f74c 100644
--- a/projects/rocr-runtime/src/topology.c
+++ b/projects/rocr-runtime/src/topology.c
@@ -236,6 +236,12 @@ static const struct hsa_gfxip_table gfxip_lookup_table[] = {
 	{ 0x731A, 10, 1, 0, "Navi10", CHIP_NAVI10 },
 	{ 0x731E, 10, 1, 0, "Navi10", CHIP_NAVI10 },
 	{ 0x731F, 10, 1, 0, "Navi10", CHIP_NAVI10 },
+	/* cyan_skillfish */
+	{ 0x13F9, 10, 1, 3, "cyan_skillfish", CHIP_CYAN_SKILLFISH },
+	{ 0x13FA, 10, 1, 3, "cyan_skillfish", CHIP_CYAN_SKILLFISH },
+	{ 0x13FB, 10, 1, 3, "cyan_skillfish", CHIP_CYAN_SKILLFISH },
+	{ 0x13FC, 10, 1, 3, "cyan_skillfish", CHIP_CYAN_SKILLFISH },
+	{ 0x13FE, 10, 1, 3, "cyan_skillfish", CHIP_CYAN_SKILLFISH },
 	/* Navi14 */
 	{ 0x7340, 10, 1, 2, "Navi14", CHIP_NAVI14 },
 	{ 0x7341, 10, 1, 2, "Navi14", CHIP_NAVI14 },