drm/amdkfd: Added gfx904 and gfx803 for KFD.

Change-Id: I4406dc70c776926feaecca3f2146d65259a80517
Signed-off-by: Gang Ba <gaba@amd.com>


[ROCm/ROCR-Runtime commit: 52ec7f805e]

projects/rocr-runtime/src/libhsakmt.h

@@ -96,9 +96,11 @@ enum asic_family_type {
 	CHIP_FIJI,
 	CHIP_POLARIS10,
 	CHIP_POLARIS11,
+	CHIP_POLARIS12,
 	CHIP_VEGA10,
-	CHIP_RAVEN,
-	CHIP_VEGA20
+	CHIP_VEGA12,
+	CHIP_VEGA20,
+	CHIP_RAVEN
 };
 
 #define IS_SOC15(chip) ((chip) >= CHIP_VEGA10)

projects/rocr-runtime/src/pmc_table.c

@@ -437,7 +437,7 @@ static uint32_t gfx8_sq_counter_ids[] = {
 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 298
 };
 
-/* Polaris 10/11 have the same SQ cpunter IDs but different from other gfx8's. */
+/* Polaris 10/11/12 have the same SQ cpunter IDs but different from other gfx8's. */
 /* Unused counters - 167 and 275 are *_DUMMY_LAST */
 static uint32_t gfx8_pl_sq_counter_ids[] = {
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
@@ -1742,9 +1742,11 @@ HSAKMT_STATUS get_block_properties(uint32_t node_id,
 		break;
 	case CHIP_POLARIS10:
 	case CHIP_POLARIS11:
+	case CHIP_POLARIS12:
 		*block = polaris_blocks[block_id];
 		break;
 	case CHIP_VEGA10:
+	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
 		*block = vega_blocks[block_id];

projects/rocr-runtime/src/queues.c

@@ -92,12 +92,24 @@ const struct device_info polaris11_device_info = {
 	.doorbell_size = DOORBELL_SIZE_GFX8,
 };
 
+const struct device_info polaris12_device_info = {
+	.asic_family = CHIP_POLARIS12,
+	.eop_buffer_size = TONGA_PAGE_SIZE,
+	.doorbell_size = DOORBELL_SIZE_GFX8,
+};
+
 const struct device_info vega10_device_info = {
 	.asic_family = CHIP_VEGA10,
 	.eop_buffer_size = 4096,
 	.doorbell_size = DOORBELL_SIZE_GFX9,
 };
 
+const struct device_info vega12_device_info = {
+	.asic_family = CHIP_VEGA12,
+	.eop_buffer_size = 4096,
+	.doorbell_size = DOORBELL_SIZE_GFX9,
+};
+
 const struct device_info raven_device_info = {
 	.asic_family = CHIP_RAVEN,
 	.eop_buffer_size = 4096,
@@ -119,7 +131,9 @@ static const struct device_info *dev_lookup_table[] = {
 	[CHIP_FIJI] = &fiji_device_info,
 	[CHIP_POLARIS10] = &polaris10_device_info,
 	[CHIP_POLARIS11] = &polaris11_device_info,
+	[CHIP_POLARIS12] = &polaris12_device_info,
 	[CHIP_VEGA10] = &vega10_device_info,
+	[CHIP_VEGA12] = &vega12_device_info,
 	[CHIP_VEGA20] = &vega20_device_info,
 	[CHIP_RAVEN] = &raven_device_info
 };

projects/rocr-runtime/src/topology.c

@@ -169,6 +169,15 @@ static struct hsa_gfxip_table {
 	{ 0x67EB, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 },
 	{ 0x67EF, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 },
 	{ 0x67FF, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 },
+	/* Polaris12 */
+	{ 0x6980, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x6981, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x6985, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x6986, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x6987, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x6995, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x6997, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
+	{ 0x699F, 8, 0, 3, 1, "Polaris12", CHIP_POLARIS12 },
 	/* Vega10 */
 	{ 0x6860, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 },
 	{ 0x6861, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 },
@@ -180,10 +189,11 @@ static struct hsa_gfxip_table {
 	{ 0x686C, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 },
 	{ 0x687F, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 },
 	/* Vega12 */
-	{ 0x69A0, 9, 0, 4, 1, "Vega12", CHIP_VEGA10 },
-	{ 0x69A1, 9, 0, 4, 1, "Vega12", CHIP_VEGA10 },
-	{ 0x69A3, 9, 0, 4, 1, "Vega12", CHIP_VEGA10 },
-	{ 0x69Af, 9, 0, 4, 1, "Vega12", CHIP_VEGA10 },
+	{ 0x69A0, 9, 0, 4, 1, "Vega12", CHIP_VEGA12 },
+	{ 0x69A1, 9, 0, 4, 1, "Vega12", CHIP_VEGA12 },
+	{ 0x69A2, 9, 0, 4, 1, "Vega12", CHIP_VEGA12 },
+	{ 0x69A3, 9, 0, 4, 1, "Vega12", CHIP_VEGA12 },
+	{ 0x69Af, 9, 0, 4, 1, "Vega12", CHIP_VEGA12 },
 	/* Raven */
 	{ 0x15DD, 9, 0, 2, 0, "Raven", CHIP_RAVEN },
 	/* Vega20 */