1 files changed, 183 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2099-drm-amd-powerplay-detect-version-of-smu-backend.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2099-drm-amd-powerplay-detect-version-of-smu-backend.patch
new file mode 100644
index 00000000..84db0ca3
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2099-drm-amd-powerplay-detect-version-of-smu-backend.patch
@@ -0,0 +1,183 @@
+From 7fc2635a365059424a22fde1f653df2ad29173eb Mon Sep 17 00:00:00 2001
+From: Prike Liang <Prike.Liang@amd.com>
+Date: Fri, 14 Jun 2019 12:06:35 +0800
+Subject: [PATCH 2099/2940] drm/amd/powerplay: detect version of smu backend
+
+Change-Id: Ib050c8cf0c2c5af4c1f747cf596860f9be01a2d3
+Signed-off-by: Prike Liang <Prike.Liang@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c             | 1 +
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h               | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c        | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c      | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c   | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c     | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c      | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c     | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c    | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c    | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c    | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c     | 1 +
+ 13 files changed, 13 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+index bb870796054c..b103415f5e58 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+@@ -195,6 +195,7 @@ int hwmgr_sw_init(struct pp_hwmgr *hwmgr)
+ 		return -EINVAL;
+ 
+ 	phm_register_irq_handlers(hwmgr);
++	pr_info("hwmgr_sw_init smu backed is %s\n",hwmgr->smumgr_funcs->name);
+ 
+ 	return hwmgr->smumgr_funcs->smu_init(hwmgr);
+ }
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+index a4721ba4e5a9..0f2cb4f01413 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+@@ -190,6 +190,7 @@ struct phm_vce_clock_voltage_dependency_table {
+ };
+ 
+ struct pp_smumgr_func {
++	char *name;
+ 	int (*smu_init)(struct pp_hwmgr  *hwmgr);
+ 	int (*smu_fini)(struct pp_hwmgr  *hwmgr);
+ 	int (*start_smu)(struct pp_hwmgr  *hwmgr);
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+index 9ef57fcf7e78..022f3c8c04f8 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+@@ -2935,6 +2935,7 @@ static int ci_update_smc_table(struct pp_hwmgr *hwmgr, uint32_t type)
+ }
+ 
+ const struct pp_smumgr_func ci_smu_funcs = {
++	.name = "ci_smu",
+ 	.smu_init = ci_smu_init,
+ 	.smu_fini = ci_smu_fini,
+ 	.start_smu = ci_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+index 0ce85b73338e..da025b1d302d 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+@@ -2643,6 +2643,7 @@ static int fiji_update_dpm_settings(struct pp_hwmgr *hwmgr,
+ }
+ 
+ const struct pp_smumgr_func fiji_smu_funcs = {
++	.name = "fiji_smu",
+ 	.smu_init = &fiji_smu_init,
+ 	.smu_fini = &smu7_smu_fini,
+ 	.start_smu = &fiji_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+index f24f13d77808..f414f22c2245 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+@@ -2661,6 +2661,7 @@ static bool iceland_is_dpm_running(struct pp_hwmgr *hwmgr)
+ }
+ 
+ const struct pp_smumgr_func iceland_smu_funcs = {
++	.name = "iceland_smu",
+ 	.smu_init = &iceland_smu_init,
+ 	.smu_fini = &smu7_smu_fini,
+ 	.start_smu = &iceland_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+index 0d8958e71b94..fbac2d3326b5 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+@@ -2550,6 +2550,7 @@ static int polaris10_update_dpm_settings(struct pp_hwmgr *hwmgr,
+ }
+ 
+ const struct pp_smumgr_func polaris10_smu_funcs = {
++	.name = "polaris10_smu",
+ 	.smu_init = polaris10_smu_init,
+ 	.smu_fini = smu7_smu_fini,
+ 	.start_smu = polaris10_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
+index 6d11076a79ba..ca660351a363 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
+@@ -291,6 +291,7 @@ static int smu10_smc_table_manager(struct pp_hwmgr *hwmgr, uint8_t *table, uint1
+ 
+ 
+ const struct pp_smumgr_func smu10_smu_funcs = {
++	.name = "smu10_smu",
+ 	.smu_init = &smu10_smu_init,
+ 	.smu_fini = &smu10_smu_fini,
+ 	.start_smu = &smu10_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c
+index e2787e14a500..8189fe402c6d 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c
+@@ -881,6 +881,7 @@ static bool smu8_is_dpm_running(struct pp_hwmgr *hwmgr)
+ }
+ 
+ const struct pp_smumgr_func smu8_smu_funcs = {
++	.name = "smu8_smu",
+ 	.smu_init = smu8_smu_init,
+ 	.smu_fini = smu8_smu_fini,
+ 	.start_smu = smu8_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
+index 060c0f7f5238..be5b7dfbe30e 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
+@@ -3240,6 +3240,7 @@ static int tonga_update_dpm_settings(struct pp_hwmgr *hwmgr,
+ }
+ 
+ const struct pp_smumgr_func tonga_smu_funcs = {
++	.name = "tonga_smu",
+ 	.smu_init = &tonga_smu_init,
+ 	.smu_fini = &smu7_smu_fini,
+ 	.start_smu = &tonga_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+index c81acc3192ad..7bfef8d85cda 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+@@ -346,6 +346,7 @@ static int vega10_smc_table_manager(struct pp_hwmgr *hwmgr, uint8_t *table,
+ }
+ 
+ const struct pp_smumgr_func vega10_smu_funcs = {
++	.name = "vega10_smu",
+ 	.smu_init = &vega10_smu_init,
+ 	.smu_fini = &vega10_smu_fini,
+ 	.start_smu = &vega10_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c
+index 1eaf0fa28ef7..9ad07a91c38b 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c
+@@ -386,6 +386,7 @@ static int vega12_smc_table_manager(struct pp_hwmgr *hwmgr, uint8_t *table,
+ }
+ 
+ const struct pp_smumgr_func vega12_smu_funcs = {
++	.name ="vega12_smu",
+ 	.smu_init = &vega12_smu_init,
+ 	.smu_fini = &vega12_smu_fini,
+ 	.start_smu = &vega12_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c
+index f301a73f6df1..957446cf467e 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c
+@@ -592,6 +592,7 @@ static int vega20_smc_table_manager(struct pp_hwmgr *hwmgr, uint8_t *table,
+ }
+ 
+ const struct pp_smumgr_func vega20_smu_funcs = {
++	.name = "vega20_smu",
+ 	.smu_init = &vega20_smu_init,
+ 	.smu_fini = &vega20_smu_fini,
+ 	.start_smu = &vega20_start_smu,
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
+index d499204b2184..7c960b07746f 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
+@@ -2279,6 +2279,7 @@ static int vegam_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)
+ }
+ 
+ const struct pp_smumgr_func vegam_smu_funcs = {
++	.name = "vegam_smu",
+ 	.smu_init = vegam_smu_init,
+ 	.smu_fini = smu7_smu_fini,
+ 	.start_smu = vegam_start_smu,
+-- 
+2.17.1
+