From 677448a6eaf4a388f4edd26683c5d74c2dd09f8c Mon Sep 17 00:00:00 2001 From: shaoyunl Date: Tue, 24 Sep 2019 18:47:23 -0400 Subject: [PATCH] Thunk : Add gfx1011 support from thunk side Change-Id: I6b202b75fc1ad0e69576a35a6a3e499818137e04 Signed-off-by: shaoyunl [ROCm/ROCR-Runtime commit: a1e399a3ff068d8c2630a297c75c478b4c3d72a1] --- projects/rocr-runtime/src/libhsakmt.h | 3 ++- projects/rocr-runtime/src/queues.c | 7 +++++++ projects/rocr-runtime/src/topology.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/rocr-runtime/src/libhsakmt.h b/projects/rocr-runtime/src/libhsakmt.h index 63e3efa0f3..d0e95ae170 100644 --- a/projects/rocr-runtime/src/libhsakmt.h +++ b/projects/rocr-runtime/src/libhsakmt.h @@ -124,7 +124,8 @@ enum asic_family_type { CHIP_RAVEN, /* 12 */ CHIP_ARCTURUS, /* 13 */ CHIP_NAVI10, /* 14 */ - CHIP_NAVI14, /* 15 */ + CHIP_NAVI12, /* 15 */ + CHIP_NAVI14, /* 16 */ CHIP_LAST }; diff --git a/projects/rocr-runtime/src/queues.c b/projects/rocr-runtime/src/queues.c index 8505bdbb1a..8ee165cf0c 100644 --- a/projects/rocr-runtime/src/queues.c +++ b/projects/rocr-runtime/src/queues.c @@ -146,6 +146,12 @@ const struct device_info navi10_device_info = { .doorbell_size = DOORBELL_SIZE_GFX9, }; +const struct device_info navi12_device_info = { + .asic_family = CHIP_NAVI12, + .eop_buffer_size = 4096, + .doorbell_size = DOORBELL_SIZE_GFX9, +}; + const struct device_info navi14_device_info = { .asic_family = CHIP_NAVI14, .eop_buffer_size = 4096, @@ -168,6 +174,7 @@ static const struct device_info *dev_lookup_table[] = { [CHIP_RAVEN] = &raven_device_info, [CHIP_ARCTURUS] = &arcturus_device_info, [CHIP_NAVI10] = &navi10_device_info, + [CHIP_NAVI12] = &navi12_device_info, [CHIP_NAVI14] = &navi14_device_info, }; diff --git a/projects/rocr-runtime/src/topology.c b/projects/rocr-runtime/src/topology.c index c686480625..6f1e490a78 100644 --- a/projects/rocr-runtime/src/topology.c +++ b/projects/rocr-runtime/src/topology.c @@ -226,6 +226,10 @@ static const struct hsa_gfxip_table gfxip_lookup_table[] = { { 0x7318, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, { 0x731A, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, { 0x731F, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, + /* Navi12 */ + { 0x7360, 10, 1, 1, 1, "Navi12", CHIP_NAVI12 }, + { 0x7362, 10, 1, 1, 1, "Navi12", CHIP_NAVI12 }, + }; /* information from /proc/cpuinfo */