Add missing CIK devices
PATCH 1/1 Add missing CIK devices
Adds mullins, kabini, and hawaii ASICs to the library.
--- src/lib/asic/CMakeLists.txt | 3 +++ src/lib/asic/hawaii.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/asic/kabini.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/asic/mullins.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/discover_by_did.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/discover_by_name.c | 3 +++ src/umr.h | 3 +++ 7 files changed, 173 insertions(+) create mode 100644 src/lib/asic/hawaii.c create mode 100644 src/lib/asic/kabini.c create mode 100644 src/lib/asic/mullins.c
src/lib/asic/CMakeLists.txt +3 -0
@@ -6,7 +6,10 @@ add_library(asic OBJECT carrizo.c fiji.c hainan.c + hawaii.c + kabini.c kaveri.c + mullins.c oland.c pitcairn.c polaris10.c
src/lib/asic/hawaii.c new file +40 -0
@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Tom St Denis <[email protected]> +* +*/ +#include "umr.h" + +struct umr_asic *umr_create_hawaii (struct umr_options *options) +{ +return +umr_create_asic_helper ("hawaii" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}
src/lib/asic/kabini.c new file +40 -0
@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Tom St Denis <[email protected]> +* +*/ +#include "umr.h" + +struct umr_asic *umr_create_kabini (struct umr_options *options) +{ +return +umr_create_asic_helper ("kabini" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}
src/lib/asic/mullins.c new file +40 -0
@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Tom St Denis <[email protected]> +* +*/ +#include "umr.h" + +struct umr_asic *umr_create_mullins (struct umr_options *options) +{ +return +umr_create_asic_helper ("mullins" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}
src/lib/discover_by_did.c +44 -0
56 lines not on this page · raw message
src/lib/discover_by_name.c +3 -0
@@ -28,10 +28,13 @@ static const struct {char *name;struct umr_asic *(*create)(struct umr_options *option); } devices[] = { + { "kabini", &umr_create_kabini }, { "kaveri", &umr_create_kaveri }, + { "mullins", &umr_create_mullins }, { "oland", &umr_create_oland }, { "bonaire", &umr_create_bonaire }, { "hainan", &umr_create_hainan }, + { "hawaii", &umr_create_hawaii }, { "tahiti", &umr_create_tahiti }, { "polaris10", &umr_create_polaris10 }, { "polaris11", &umr_create_polaris11 },
src/umr.h +3 -0
@@ -387,7 +387,10 @@ struct umr_asic *umr_create_bonaire(struct umr_options *options);struct umr_asic *umr_create_carrizo (struct umr_options *options);struct umr_asic *umr_create_fiji (struct umr_options *options);struct umr_asic *umr_create_hainan (struct umr_options *options); +struct umr_asic *umr_create_hawaii (struct umr_options *options); +struct umr_asic *umr_create_kabini (struct umr_options *options);struct umr_asic *umr_create_kaveri (struct umr_options *options); +struct umr_asic *umr_create_mullins (struct umr_options *options);struct umr_asic *umr_create_oland (struct umr_options *options);struct umr_asic *umr_create_pitcairn (struct umr_options *options);struct umr_asic *umr_create_polaris10 (struct umr_options *options);
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Christian König
Acked-byAm 13.02.2017 um 13:46 schrieb Tom St Denis:
Quoted 3 lines
Adds mullins, kabini, and hawaii ASICs to the library.
Signed-off-by Tom St Denis <[email protected]>
Quoted 251 lines
--- src/lib/asic/CMakeLists.txt | 3 +++ src/lib/asic/hawaii.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/asic/kabini.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/asic/mullins.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/discover_by_did.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/discover_by_name.c | 3 +++ src/umr.h | 3 +++ 7 files changed, 173 insertions(+)create mode 100644
src/lib/asic/hawaii.c
create mode 100644src/lib/asic/kabini.c
create mode 100644src/lib/asic/mullins.csrc/lib/asic/CMakeLists.txt +3
-0@@ -6,7 +6,10 @@ add_library(asic OBJECT carrizo.c fiji.c hainan.c + hawaii.c + kabini.c kaveri.c + mullins.c oland.c pitcairn.c polaris10.csrc/lib/asic/hawaii.c new file +40
-0@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Tom St Denis <[email protected]> +* +*/ +#include "umr.h" + +struct umr_asic *umr_create_hawaii (struct umr_options *options) +{ +return +umr_create_asic_helper ("hawaii" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}src/lib/asic/kabini.c new file +40
-0@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Tom St Denis <[email protected]> +* +*/ +#include "umr.h" + +struct umr_asic *umr_create_kabini (struct umr_options *options) +{ +return +umr_create_asic_helper ("kabini" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}src/lib/asic/mullins.c new file +40
-0@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Tom St Denis <[email protected]> +* +*/ +#include "umr.h" + +struct umr_asic *umr_create_mullins (struct umr_options *options) +{ +return +umr_create_asic_helper ("mullins" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}src/lib/discover_by_did.c +44
-0@@ -88,6 +88,18 @@ static const struct { { 0x679B, &umr_create_tahiti }, { 0x679E, &umr_create_tahiti }, { 0x679F, &umr_create_tahiti }, + { 0x67A0, &umr_create_hawaii }, + { 0x67A1, &umr_create_hawaii }, + { 0x67A2, &umr_create_hawaii }, + { 0x67A8, &umr_create_hawaii }, + { 0x67A9, &umr_create_hawaii }, + { 0x67AA, &umr_create_hawaii }, + { 0x67B0, &umr_create_hawaii }, + { 0x67B1, &umr_create_hawaii }, + { 0x67B8, &umr_create_hawaii }, + { 0x67B9, &umr_create_hawaii }, + { 0x67BA, &umr_create_hawaii }, + { 0x67BE, &umr_create_hawaii }, { 0x67C0, &umr_create_polaris10 }, { 0x67C1, &umr_create_polaris10 }, { 0x67C2, &umr_create_polaris10 },@@ -165,6 +177,38 @@ static const struct { { 0x698F, &umr_create_polaris12 }, { 0x7300, &umr_create_fiji }, { 0x730F, &umr_create_fiji }, + { 0x9830, &umr_create_kabini }, + { 0x9831, &umr_create_kabini }, + { 0x9832, &umr_create_kabini }, + { 0x9833, &umr_create_kabini }, + { 0x9834, &umr_create_kabini }, + { 0x9835, &umr_create_kabini }, + { 0x9836, &umr_create_kabini }, + { 0x9837, &umr_create_kabini }, + { 0x9838, &umr_create_kabini }, + { 0x9839, &umr_create_kabini }, + { 0x983a, &umr_create_kabini }, + { 0x983b, &umr_create_kabini }, + { 0x983c, &umr_create_kabini }, + { 0x983d, &umr_create_kabini }, + { 0x983e, &umr_create_kabini }, + { 0x983f, &umr_create_kabini }, + { 0x9850, &umr_create_mullins }, + { 0x9851, &umr_create_mullins }, + { 0x9852, &umr_create_mullins }, + { 0x9853, &umr_create_mullins }, + { 0x9854, &umr_create_mullins }, + { 0x9855, &umr_create_mullins }, + { 0x9856, &umr_create_mullins }, + { 0x9857, &umr_create_mullins }, + { 0x9858, &umr_create_mullins }, + { 0x9859, &umr_create_mullins }, + { 0x985A, &umr_create_mullins }, + { 0x985B, &umr_create_mullins }, + { 0x985C, &umr_create_mullins }, + { 0x985D, &umr_create_mullins }, + { 0x985E, &umr_create_mullins }, + { 0x985F, &umr_create_mullins }, { 0x9870, &umr_create_carrizo }, { 0x9874, &umr_create_carrizo }, { 0x9875, &umr_create_carrizo },src/lib/discover_by_name.c +3
-0@@ -28,10 +28,13 @@ static const struct {char *name;struct umr_asic *(*create)(struct umr_options *option); } devices[] = { + { "kabini", &umr_create_kabini }, { "kaveri", &umr_create_kaveri }, + { "mullins", &umr_create_mullins }, { "oland", &umr_create_oland }, { "bonaire", &umr_create_bonaire }, { "hainan", &umr_create_hainan }, + { "hawaii", &umr_create_hawaii }, { "tahiti", &umr_create_tahiti }, { "polaris10", &umr_create_polaris10 }, { "polaris11", &umr_create_polaris11 },src/umr.h +0
-0
src/umr.h struct umr_asic *umr_create_bonaire(struct umr_options *options); · line 396
Quoted 10 lines
src/umr.h +3
-0@@ -387,7 +387,10 @@ struct umr_asic *umr_create_bonaire(struct umr_options *options);struct umr_asic *umr_create_carrizo (struct umr_options *options);struct umr_asic *umr_create_fiji (struct umr_options *options);struct umr_asic *umr_create_hainan (struct umr_options *options); +struct umr_asic *umr_create_hawaii (struct umr_options *options); +struct umr_asic *umr_create_kabini (struct umr_options *options);struct umr_asic *umr_create_kaveri (struct umr_options *options); +struct umr_asic *umr_create_mullins (struct umr_options *options);struct umr_asic *umr_create_oland (struct umr_options *options);struct umr_asic *umr_create_pitcairn (struct umr_options *options);struct umr_asic *umr_create_polaris10 (struct umr_options *options);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): c8627ffc-c84b-6217-fb21-1554434ece2b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Quoted 6 lines · Christian König
Am 13.02.2017 um 13:46 schrieb Tom St Denis:
Quoted 3 lines
Adds mullins, kabini, and hawaii ASICs to the library.
Signed-off-by Tom St Denis <[email protected]>Acked-by Christian König <[email protected]>.
Thanks.
If there are no objections I'll push it out in a couple hours.
Cheers,
Tom
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Acked-by Alex DeucherQuoted 11 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Monday, February 13, 2017 7:46 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] Add missing CIK devicesAdds mullins, kabini, and hawaii ASICs to the library.
Signed-off-by Tom St Denis <[email protected]>
The smu blocks are slightly different on CI dGPUs vs. APUs. Hawaii should follow Bonaire and kabini and mullins should follow kaveri.
Alex
Quoted 290 lines
--- src/lib/asic/CMakeLists.txt | 3 +++ src/lib/asic/hawaii.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/asic/kabini.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/asic/mullins.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lib/discover_by_did.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/discover_by_name.c | 3 +++ src/umr.h | 3 +++ 7 files changed, 173 insertions(+) create mode 100644 src/lib/asic/hawaii.c create mode 100644 src/lib/asic/kabini.c create mode 100644 src/lib/asic/mullins.csrc/lib/asic/CMakeLists.txt +3
-0@@ -6,7 +6,10 @@ add_library(asic OBJECT carrizo.c fiji.c hainan.c + hawaii.c + kabini.c kaveri.c + mullins.c oland.c pitcairn.c polaris10.csrc/lib/asic/hawaii.c new file +5
-0@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Tom St Denis <[email protected]>
+ *
+ */src/lib/asic/hawaii.c new file +16
-0+#include "umr.h" + +struct umr_asic *umr_create_hawaii (struct umr_options *options) +{ +return +umr_create_asic_helper ("hawaii" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}src/lib/asic/kabini.c new file +5
-0@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Tom St Denis <[email protected]>
+ *
+ */src/lib/asic/kabini.c new file +16
-0+#include "umr.h" + +struct umr_asic *umr_create_kabini (struct umr_options *options) +{ +return +umr_create_asic_helper ("kabini" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}src/lib/asic/mullins.c new file +5
-0@@ -0,0 +1,40 @@ +/* +* Copyright 2017 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Tom St Denis <[email protected]>
+ *
+ */src/lib/asic/mullins.c new file +16
-0+#include "umr.h" + +struct umr_asic *umr_create_mullins (struct umr_options *options) +{ +return +umr_create_asic_helper ("mullins" ,FAMILY_CIK , +umr_create_uvd42 (options), +umr_create_vce2 (options), +umr_create_gmc70 (options), +umr_create_dce80 (options), +umr_create_gfx72 (options), +umr_create_smu700 (options), +umr_create_oss20 (options), +umr_create_bif41 (options), +NULL ); +}src/lib/discover_by_did.c +44
-0@@ -88,6 +88,18 @@ static const struct { { 0x679B, &umr_create_tahiti }, { 0x679E, &umr_create_tahiti }, { 0x679F, &umr_create_tahiti }, + { 0x67A0, &umr_create_hawaii }, + { 0x67A1, &umr_create_hawaii }, + { 0x67A2, &umr_create_hawaii }, + { 0x67A8, &umr_create_hawaii }, + { 0x67A9, &umr_create_hawaii }, + { 0x67AA, &umr_create_hawaii }, + { 0x67B0, &umr_create_hawaii }, + { 0x67B1, &umr_create_hawaii }, + { 0x67B8, &umr_create_hawaii }, + { 0x67B9, &umr_create_hawaii }, + { 0x67BA, &umr_create_hawaii }, + { 0x67BE, &umr_create_hawaii }, { 0x67C0, &umr_create_polaris10 }, { 0x67C1, &umr_create_polaris10 }, { 0x67C2, &umr_create_polaris10 },@@ -165,6 +177,38 @@ static const struct { { 0x698F, &umr_create_polaris12 }, { 0x7300, &umr_create_fiji }, { 0x730F, &umr_create_fiji }, + { 0x9830, &umr_create_kabini }, + { 0x9831, &umr_create_kabini }, + { 0x9832, &umr_create_kabini }, + { 0x9833, &umr_create_kabini }, + { 0x9834, &umr_create_kabini }, + { 0x9835, &umr_create_kabini }, + { 0x9836, &umr_create_kabini }, + { 0x9837, &umr_create_kabini }, + { 0x9838, &umr_create_kabini }, + { 0x9839, &umr_create_kabini }, + { 0x983a, &umr_create_kabini }, + { 0x983b, &umr_create_kabini }, + { 0x983c, &umr_create_kabini }, + { 0x983d, &umr_create_kabini }, + { 0x983e, &umr_create_kabini }, + { 0x983f, &umr_create_kabini }, + { 0x9850, &umr_create_mullins }, + { 0x9851, &umr_create_mullins }, + { 0x9852, &umr_create_mullins }, + { 0x9853, &umr_create_mullins }, + { 0x9854, &umr_create_mullins }, + { 0x9855, &umr_create_mullins }, + { 0x9856, &umr_create_mullins }, + { 0x9857, &umr_create_mullins }, + { 0x9858, &umr_create_mullins }, + { 0x9859, &umr_create_mullins }, + { 0x985A, &umr_create_mullins }, + { 0x985B, &umr_create_mullins }, + { 0x985C, &umr_create_mullins }, + { 0x985D, &umr_create_mullins }, + { 0x985E, &umr_create_mullins }, + { 0x985F, &umr_create_mullins }, { 0x9870, &umr_create_carrizo }, { 0x9874, &umr_create_carrizo }, { 0x9875, &umr_create_carrizo },src/lib/discover_by_name.c +3
-0@@ -28,10 +28,13 @@ static const struct {char *name;struct umr_asic *(*create)(struct umr_options *option); } devices[] = { + { "kabini", &umr_create_kabini }, { "kaveri", &umr_create_kaveri }, + { "mullins", &umr_create_mullins }, { "oland", &umr_create_oland }, { "bonaire", &umr_create_bonaire }, { "hainan", &umr_create_hainan }, + { "hawaii", &umr_create_hawaii }, { "tahiti", &umr_create_tahiti }, { "polaris10", &umr_create_polaris10 }, { "polaris11", &umr_create_polaris11 },src/umr.h +3
-0@@ -387,7 +387,10 @@ struct umr_asic *umr_create_bonaire(struct umr_options *options);struct umr_asic *umr_create_carrizo (struct umr_options *options);struct umr_asic *umr_create_fiji (struct umr_options *options);struct umr_asic *umr_create_hainan (struct umr_options *options); +struct umr_asic *umr_create_hawaii (struct umr_options *options); +struct umr_asic *umr_create_kabini (struct umr_options *options);struct umr_asic *umr_create_kaveri (struct umr_options *options); +struct umr_asic *umr_create_mullins (struct umr_options *options);struct umr_asic *umr_create_oland (struct umr_options *options);struct umr_asic *umr_create_pitcairn (struct umr_options *options);struct
umr_asic*umr_create_polaris10(structumr_options*options);
--
2.11.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1652148A0CA8B6ADD7787BB4F7590-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Quoted 8 lines · Alexander
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Monday, February 13, 2017 7:46 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] Add missing CIK devices
Quoted 6 lines
Quoted 3 lines
Adds mullins, kabini, and hawaii ASICs to the library.
Signed-off-by Tom St Denis <[email protected]>The smu blocks are slightly different on CI dGPUs vs. APUs. Hawaii should follow Bonaire and kabini and mullins should follow kaveri.
Acked-by Alex Deucher <[email protected]>
Thanks. Corrected. Bonaire also had the wrong version. I've pushed out v2 of the patch with those corrections.
Cheers,
Tom
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx