From bbc6eb6f3fbd174e9aa12dcf6c2afd98e1b6ce95 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 18:54:05 +0800 Subject: [PATCH] libhsakmt: remove is_dgpu flag in the hsa_gfxip_table Whether use dgpu path will check the props which exposed from kernel. We won't need hard code in the ASIC table. Signed-off-by: Huang Rui Change-Id: I0c018a26b219914a41197ff36dbec7a75945d452 [ROCm/ROCR-Runtime commit: ad87f38dad621c4306d15175c0d16cef16938f6b] --- projects/rocr-runtime/src/libhsakmt.h | 1 - projects/rocr-runtime/src/openclose.c | 9 +- projects/rocr-runtime/src/topology.c | 252 +++++++++++++------------- 3 files changed, 130 insertions(+), 132 deletions(-) diff --git a/projects/rocr-runtime/src/libhsakmt.h b/projects/rocr-runtime/src/libhsakmt.h index e5e650bfe6..2bbec6f211 100644 --- a/projects/rocr-runtime/src/libhsakmt.h +++ b/projects/rocr-runtime/src/libhsakmt.h @@ -138,7 +138,6 @@ struct hsa_gfxip_table { unsigned char major; // GFXIP Major engine version unsigned char minor; // GFXIP Minor engine version unsigned char stepping; // GFXIP Stepping info - unsigned char is_dgpu; // Predicate for dGPU devices const char *amd_name; // CALName of the device enum asic_family_type asic_family; // Device family id }; diff --git a/projects/rocr-runtime/src/openclose.c b/projects/rocr-runtime/src/openclose.c index 72dfd66a1f..2ffe9a8268 100644 --- a/projects/rocr-runtime/src/openclose.c +++ b/projects/rocr-runtime/src/openclose.c @@ -141,12 +141,12 @@ static HSAKMT_STATUS init_vars_from_env(void) */ envvar = getenv("HSA_FORCE_ASIC_TYPE"); if (envvar) { - uint32_t major, minor, step, dgpu, asic_family; + uint32_t major, minor, step, asic_family; - if ((sscanf(envvar, "%u.%u.%u %u %63s %u", &major, &minor, &step, - &dgpu, force_asic_name, &asic_family) != 6) + if ((sscanf(envvar, "%u.%u.%u %63s %u", &major, &minor, &step, + force_asic_name, &asic_family) != 6) || (major > 63 || minor > 255 || step > 255) - || dgpu > 1 || asic_family >= CHIP_LAST) { + || asic_family >= CHIP_LAST) { pr_err("HSA_FORCE_ASIC_TYPE %s is invalid\n", envvar); return HSAKMT_STATUS_ERROR; } @@ -154,7 +154,6 @@ static HSAKMT_STATUS init_vars_from_env(void) force_asic_entry.major = major; force_asic_entry.minor = minor; force_asic_entry.stepping = step; - force_asic_entry.is_dgpu = dgpu; force_asic_entry.asic_family = asic_family; diff --git a/projects/rocr-runtime/src/topology.c b/projects/rocr-runtime/src/topology.c index 3e6ca1e2d4..eb05be8c57 100644 --- a/projects/rocr-runtime/src/topology.c +++ b/projects/rocr-runtime/src/topology.c @@ -92,149 +92,149 @@ struct hsa_gfxip_table force_asic_entry = { static const struct hsa_gfxip_table gfxip_lookup_table[] = { /* Kaveri Family */ - { 0x1304, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1305, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1306, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1307, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1309, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x130A, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x130B, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x130C, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x130D, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x130E, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x130F, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1310, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1311, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1312, 7, 0, 0, 0, "Spooky", CHIP_KAVERI }, - { 0x1313, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1315, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x1316, 7, 0, 0, 0, "Spooky", CHIP_KAVERI }, - { 0x1317, 7, 0, 0, 0, "Spooky", CHIP_KAVERI }, - { 0x1318, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x131B, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x131C, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, - { 0x131D, 7, 0, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1304, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1305, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1306, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1307, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1309, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x130A, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x130B, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x130C, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x130D, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x130E, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x130F, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1310, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1311, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1312, 7, 0, 0, "Spooky", CHIP_KAVERI }, + { 0x1313, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1315, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x1316, 7, 0, 0, "Spooky", CHIP_KAVERI }, + { 0x1317, 7, 0, 0, "Spooky", CHIP_KAVERI }, + { 0x1318, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x131B, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x131C, 7, 0, 0, "Spectre", CHIP_KAVERI }, + { 0x131D, 7, 0, 0, "Spectre", CHIP_KAVERI }, /* Hawaii Family */ - { 0x67A0, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67A1, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67A2, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67A8, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67A9, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67AA, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67B0, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67B1, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67B8, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67B9, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67BA, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, - { 0x67BE, 7, 0, 1, 1, "Hawaii", CHIP_HAWAII }, + { 0x67A0, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67A1, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67A2, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67A8, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67A9, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67AA, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67B0, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67B1, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67B8, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67B9, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67BA, 7, 0, 1, "Hawaii", CHIP_HAWAII }, + { 0x67BE, 7, 0, 1, "Hawaii", CHIP_HAWAII }, /* Carrizo Family */ - { 0x9870, 8, 0, 1, 0, "Carrizo", CHIP_CARRIZO }, - { 0x9874, 8, 0, 1, 0, "Carrizo", CHIP_CARRIZO }, - { 0x9875, 8, 0, 1, 0, "Carrizo", CHIP_CARRIZO }, - { 0x9876, 8, 0, 1, 0, "Carrizo", CHIP_CARRIZO }, - { 0x9877, 8, 0, 1, 0, "Carrizo", CHIP_CARRIZO }, + { 0x9870, 8, 0, 1, "Carrizo", CHIP_CARRIZO }, + { 0x9874, 8, 0, 1, "Carrizo", CHIP_CARRIZO }, + { 0x9875, 8, 0, 1, "Carrizo", CHIP_CARRIZO }, + { 0x9876, 8, 0, 1, "Carrizo", CHIP_CARRIZO }, + { 0x9877, 8, 0, 1, "Carrizo", CHIP_CARRIZO }, /* Tonga Family */ - { 0x6920, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x6921, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x6928, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x6929, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x692B, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x692F, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x6930, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x6938, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, - { 0x6939, 8, 0, 2, 1, "Tonga", CHIP_TONGA }, + { 0x6920, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x6921, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x6928, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x6929, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x692B, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x692F, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x6930, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x6938, 8, 0, 2, "Tonga", CHIP_TONGA }, + { 0x6939, 8, 0, 2, "Tonga", CHIP_TONGA }, /* Fiji */ - { 0x7300, 8, 0, 3, 1, "Fiji", CHIP_FIJI }, - { 0x730F, 8, 0, 3, 1, "Fiji", CHIP_FIJI }, + { 0x7300, 8, 0, 3, "Fiji", CHIP_FIJI }, + { 0x730F, 8, 0, 3, "Fiji", CHIP_FIJI }, /* Polaris10 */ - { 0x67C0, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67C1, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67C2, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67C4, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67C7, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67C8, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67C9, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67CA, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67CC, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67CF, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67D0, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x67DF, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, - { 0x6FDF, 8, 0, 3, 1, "Polaris10", CHIP_POLARIS10 }, + { 0x67C0, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67C1, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67C2, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67C4, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67C7, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67C8, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67C9, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67CA, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67CC, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67CF, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67D0, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x67DF, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, + { 0x6FDF, 8, 0, 3, "Polaris10", CHIP_POLARIS10 }, /* Polaris11 */ - { 0x67E0, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67E1, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67E3, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67E7, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67E8, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67E9, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67EB, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67EF, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, - { 0x67FF, 8, 0, 3, 1, "Polaris11", CHIP_POLARIS11 }, + { 0x67E0, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67E1, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67E3, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67E7, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67E8, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67E9, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67EB, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67EF, 8, 0, 3, "Polaris11", CHIP_POLARIS11 }, + { 0x67FF, 8, 0, 3, "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 }, + { 0x6980, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x6981, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x6985, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x6986, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x6987, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x6995, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x6997, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, + { 0x699F, 8, 0, 3, "Polaris12", CHIP_POLARIS12 }, /* VegaM */ - { 0x694C, 8, 0, 3, 1, "VegaM", CHIP_VEGAM }, - { 0x694E, 8, 0, 3, 1, "VegaM", CHIP_VEGAM }, - { 0x694F, 8, 0, 3, 1, "VegaM", CHIP_VEGAM }, + { 0x694C, 8, 0, 3, "VegaM", CHIP_VEGAM }, + { 0x694E, 8, 0, 3, "VegaM", CHIP_VEGAM }, + { 0x694F, 8, 0, 3, "VegaM", CHIP_VEGAM }, /* Vega10 */ - { 0x6860, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6861, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6862, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6863, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6864, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6867, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6868, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x6869, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x686A, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x686B, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x686C, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x686D, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x686E, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, - { 0x687F, 9, 0, 0, 1, "Vega10", CHIP_VEGA10 }, + { 0x6860, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6861, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6862, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6863, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6864, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6867, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6868, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x6869, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x686A, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x686B, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x686C, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x686D, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x686E, 9, 0, 0, "Vega10", CHIP_VEGA10 }, + { 0x687F, 9, 0, 0, "Vega10", CHIP_VEGA10 }, /* Vega12 */ - { 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 }, + { 0x69A0, 9, 0, 4, "Vega12", CHIP_VEGA12 }, + { 0x69A1, 9, 0, 4, "Vega12", CHIP_VEGA12 }, + { 0x69A2, 9, 0, 4, "Vega12", CHIP_VEGA12 }, + { 0x69A3, 9, 0, 4, "Vega12", CHIP_VEGA12 }, + { 0x69Af, 9, 0, 4, "Vega12", CHIP_VEGA12 }, /* Raven */ - { 0x15DD, 9, 0, 2, 0, "Raven", CHIP_RAVEN }, - { 0x15D8, 9, 0, 2, 0, "Raven", CHIP_RAVEN }, + { 0x15DD, 9, 0, 2, "Raven", CHIP_RAVEN }, + { 0x15D8, 9, 0, 2, "Raven", CHIP_RAVEN }, /* Renoir */ - { 0x1636, 9, 0, 0, 1, "Renoir", CHIP_RENOIR }, + { 0x1636, 9, 0, 0, "Renoir", CHIP_RENOIR }, /* Vega20 */ - { 0x66A0, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, - { 0x66A1, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, - { 0x66A2, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, - { 0x66A3, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, - { 0x66A4, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, - { 0x66A7, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, - { 0x66AF, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, + { 0x66A0, 9, 0, 6, "Vega20", CHIP_VEGA20 }, + { 0x66A1, 9, 0, 6, "Vega20", CHIP_VEGA20 }, + { 0x66A2, 9, 0, 6, "Vega20", CHIP_VEGA20 }, + { 0x66A3, 9, 0, 6, "Vega20", CHIP_VEGA20 }, + { 0x66A4, 9, 0, 6, "Vega20", CHIP_VEGA20 }, + { 0x66A7, 9, 0, 6, "Vega20", CHIP_VEGA20 }, + { 0x66AF, 9, 0, 6, "Vega20", CHIP_VEGA20 }, /* Arcturus */ - { 0x7388, 9, 0, 8, 1, "Arcturus", CHIP_ARCTURUS }, - { 0x738C, 9, 0, 8, 1, "Arcturus", CHIP_ARCTURUS }, - { 0x738E, 9, 0, 8, 1, "Arcturus", CHIP_ARCTURUS }, - { 0x7390, 9, 0, 8, 1, "Arcturus", CHIP_ARCTURUS }, + { 0x7388, 9, 0, 8, "Arcturus", CHIP_ARCTURUS }, + { 0x738C, 9, 0, 8, "Arcturus", CHIP_ARCTURUS }, + { 0x738E, 9, 0, 8, "Arcturus", CHIP_ARCTURUS }, + { 0x7390, 9, 0, 8, "Arcturus", CHIP_ARCTURUS }, /* Navi10 */ - { 0x7310, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, - { 0x7312, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, - { 0x7318, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, - { 0x731A, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, - { 0x731F, 10, 1, 0, 1, "Navi10", CHIP_NAVI10 }, + { 0x7310, 10, 1, 0, "Navi10", CHIP_NAVI10 }, + { 0x7312, 10, 1, 0, "Navi10", CHIP_NAVI10 }, + { 0x7318, 10, 1, 0, "Navi10", CHIP_NAVI10 }, + { 0x731A, 10, 1, 0, "Navi10", CHIP_NAVI10 }, + { 0x731F, 10, 1, 0, "Navi10", CHIP_NAVI10 }, /* Navi14 */ - { 0x7340, 10, 1, 2, 1, "Navi14", CHIP_NAVI14 }, - { 0x7341, 10, 1, 2, 1, "Navi14", CHIP_NAVI14 }, - { 0x7347, 10, 1, 2, 1, "Navi14", CHIP_NAVI14 }, + { 0x7340, 10, 1, 2, "Navi14", CHIP_NAVI14 }, + { 0x7341, 10, 1, 2, "Navi14", CHIP_NAVI14 }, + { 0x7347, 10, 1, 2, "Navi14", CHIP_NAVI14 }, /* Navi12 */ - { 0x7360, 10, 1, 1, 1, "Navi12", CHIP_NAVI12 }, - { 0x7362, 10, 1, 1, 1, "Navi12", CHIP_NAVI12 }, + { 0x7360, 10, 1, 1, "Navi12", CHIP_NAVI12 }, + { 0x7362, 10, 1, 1, "Navi12", CHIP_NAVI12 }, }; /* information from /proc/cpuinfo */