[PATCH umr] Introduction of VegaM

Tom St Denis tom.stdenis at amd.com
Mon Apr 30 14:39:56 UTC 2018


Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
---
 src/lib/asic/CMakeLists.txt |  1 +
 src/lib/asic/vegam.c        | 40 ++++++++++++++++++++++++++++++++++++++++
 src/lib/discover_by_did.c   |  2 ++
 src/lib/discover_by_name.c  |  1 +
 src/umr.h                   |  1 +
 5 files changed, 45 insertions(+)
 create mode 100644 src/lib/asic/vegam.c

diff --git a/src/lib/asic/CMakeLists.txt b/src/lib/asic/CMakeLists.txt
index 8dfe4496319d..38cf9468396f 100644
--- a/src/lib/asic/CMakeLists.txt
+++ b/src/lib/asic/CMakeLists.txt
@@ -22,5 +22,6 @@ add_library(asic OBJECT
   topaz.c
   vega10.c
   vega12.c
+  vegam.c
   verde.c
 )
diff --git a/src/lib/asic/vegam.c b/src/lib/asic/vegam.c
new file mode 100644
index 000000000000..d9c5c7f10702
--- /dev/null
+++ b/src/lib/asic/vegam.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018 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 <tom.stdenis at amd.com>
+ *
+ */
+#include "umr.h"
+
+struct umr_asic *umr_create_vegam(struct umr_options *options)
+{
+	return
+		umr_create_asic_helper("vegam", FAMILY_VI,
+			umr_create_uvd6(options),
+			umr_create_vce3(options),
+			umr_create_gmc81(options),
+			umr_create_dce112(options),
+			umr_create_gfx80(options),
+			umr_create_smu713(options),
+			umr_create_oss30(options),
+			umr_create_bif51(options),
+			NULL);
+}
diff --git a/src/lib/discover_by_did.c b/src/lib/discover_by_did.c
index 166d90143f9e..b900bfaed160 100644
--- a/src/lib/discover_by_did.c
+++ b/src/lib/discover_by_did.c
@@ -172,6 +172,8 @@ static const struct {
 	{ 0x6930, &umr_create_tonga  },
 	{ 0x6938, &umr_create_tonga  },
 	{ 0x6939, &umr_create_tonga  },
+	{ 0x694C, &umr_create_vegam },
+	{ 0x694E, &umr_create_vegam },
 	{ 0x6980, &umr_create_polaris12 },
 	{ 0x6981, &umr_create_polaris12 },
 	{ 0x6985, &umr_create_polaris12 },
diff --git a/src/lib/discover_by_name.c b/src/lib/discover_by_name.c
index 058f2ea991eb..deb95dff4fb6 100644
--- a/src/lib/discover_by_name.c
+++ b/src/lib/discover_by_name.c
@@ -48,6 +48,7 @@ static const struct {
 	{ "stoney", &umr_create_stoney },
 	{ "vega10", &umr_create_vega10 },
 	{ "vega12", &umr_create_vega12 },
+	{ "vegam", &umr_create_vegam },
 	{ "raven1", &umr_create_raven1 },
 };
 
diff --git a/src/umr.h b/src/umr.h
index f026e82be98e..e4ae645cea62 100644
--- a/src/umr.h
+++ b/src/umr.h
@@ -553,6 +553,7 @@ struct umr_asic *umr_create_tonga(struct umr_options *options);
 struct umr_asic *umr_create_topaz(struct umr_options *options);
 struct umr_asic *umr_create_vega10(struct umr_options *options);
 struct umr_asic *umr_create_vega12(struct umr_options *options);
+struct umr_asic *umr_create_vegam(struct umr_options *options);
 struct umr_asic *umr_create_verde(struct umr_options *options);
 
 
-- 
2.14.3



More information about the amd-gfx mailing list