Skip to contentSkip to conversation

drm/amd/powerplay: delete dead functions in vega10.

PATCH In review Rex Zhu 2 participants 2 messages Apr 17, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: delete dead functions in vega10.

Vega10 does not support AVFS BTC, remove function.

Change-Id: If9e7845e581e0e3062febca2c81620ca6ba26016

---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 30 ++--------------------
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  9 -------
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h   |  1 -
 3 files changed, 2 insertions(+), 38 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2 -28
index 561b837..3e11abe 100644
@@ -2411,35 +2411,9 @@ static int vega10_init_smc_table(struct pp_hwmgr *hwmgr)
 	PP_ASSERT_WITH_CODE(!result,
 			"Failed to upload PPtable!", return result);
 
-	if (data->smu_features[GNLD_AVFS].supported) {
-		uint32_t features_enabled;
-		result = vega10_get_smc_features(hwmgr->smumgr, &features_enabled);
-		PP_ASSERT_WITH_CODE(!result,
-				"Failed to Retrieve Enabled Features!",
-				return result);
-		if (!(features_enabled & (1 << FEATURE_AVFS_BIT))) {
-			result = vega10_perform_btc(hwmgr->smumgr);
-			PP_ASSERT_WITH_CODE(!result,
-					"Failed to Perform BTC!",
+	result = vega10_avfs_enable(hwmgr, true);
+	PP_ASSERT_WITH_CODE(!result, "Attempt to enable AVFS feature Failed!",
 					return result);
-			result = vega10_avfs_enable(hwmgr, true);
-			PP_ASSERT_WITH_CODE(!result,
-					"Attempt to enable AVFS feature Failed!",
-					return result);
-			result = vega10_save_vft_table(hwmgr->smumgr,
-					(uint8_t *)&(data->smc_state_table.avfs_table));
-			PP_ASSERT_WITH_CODE(!result,
-					"Attempt to save VFT table Failed!",
-					return result);
-		} else {
-			data->smu_features[GNLD_AVFS].enabled = true;
-			result = vega10_restore_vft_table(hwmgr->smumgr,
-					(uint8_t *)&(data->smc_state_table.avfs_table));
-			PP_ASSERT_WITH_CODE(!result,
-					"Attempt to restore VFT table Failed!",
-					return result;);
-		}
-	}
 
 	return 0;
 }
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +0 -9
index 2685f02..7a36a74 100644
@@ -299,15 +299,6 @@ int vega10_copy_table_to_smc(struct pp_smumgr *smumgr,
 	return 0;
 }
 
-int vega10_perform_btc(struct pp_smumgr *smumgr)
-{
-	PP_ASSERT_WITH_CODE(!vega10_send_msg_to_smc_with_parameter(
-			smumgr, PPSMC_MSG_RunBtc, 0),
-			"Attempt to run DC BTC Failed!",
-			return -1);
-	return 0;
-}
-
 int vega10_save_vft_table(struct pp_smumgr *smumgr, uint8_t *avfs_table)
 {
 	PP_ASSERT_WITH_CODE(avfs_table,
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h +0 -1
index ad05021..71e9b64 100644
@@ -62,7 +62,6 @@ int vega10_get_smc_features(struct pp_smumgr *smumgr,
 		uint32_t *features_enabled);
 int vega10_save_vft_table(struct pp_smumgr *smumgr, uint8_t *avfs_table);
 int vega10_restore_vft_table(struct pp_smumgr *smumgr, uint8_t *avfs_table);
-int vega10_perform_btc(struct pp_smumgr *smumgr);
 
 int vega10_set_tools_address(struct pp_smumgr *smumgr);
 
Signature · 6 lines
1.9.1

_______________________________________________
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): 1492435366-30492-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

Reviewed-by Alex Deucher
#2 lore raw
Quoted 11 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Monday, April 17, 2017 9:23 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: delete dead functions in vega10.

Vega10 does not support AVFS BTC, remove function.

Change-Id: If9e7845e581e0e3062febca2c81620ca6ba26016

Missing your signed-off-by. With that fixed:

Quoted 98 lines
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 30 ++-----------
---------
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  9 -------
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h   |  1 -
 3 files changed, 2 insertions(+), 38 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2 -13
index 561b837..3e11abe 100644
@@ -2411,35 +2411,9 @@ static int vega10_init_smc_table(struct pp_hwmgr
 *hwmgr)
 	PP_ASSERT_WITH_CODE(!result,
 			"Failed to upload PPtable!", return result);
 
-	if (data->smu_features[GNLD_AVFS].supported) {
-		uint32_t features_enabled;
-		result = vega10_get_smc_features(hwmgr->smumgr,
 &features_enabled);
-		PP_ASSERT_WITH_CODE(!result,
-				"Failed to Retrieve Enabled Features!",
-				return result);
-		if (!(features_enabled & (1 << FEATURE_AVFS_BIT))) {
-			result = vega10_perform_btc(hwmgr->smumgr);
-			PP_ASSERT_WITH_CODE(!result,
-					"Failed to Perform BTC!",
+	result = vega10_avfs_enable(hwmgr, true);
+	PP_ASSERT_WITH_CODE(!result, "Attempt to enable AVFS feature
 Failed!",
 					return result);
-			result = vega10_avfs_enable(hwmgr, true);
-			PP_ASSERT_WITH_CODE(!result,
-					"Attempt to enable AVFS feature

Failed!",

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -3
-					return result);
-			result = vega10_save_vft_table(hwmgr->smumgr,
-					(uint8_t *)&(data-
Quoted 1 line

smc_state_table.avfs_table));

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -7
-			PP_ASSERT_WITH_CODE(!result,
-					"Attempt to save VFT table Failed!",
-					return result);
-		} else {
-			data->smu_features[GNLD_AVFS].enabled = true;
-			result = vega10_restore_vft_table(hwmgr->smumgr,
-					(uint8_t *)&(data-
Quoted 1 line

smc_state_table.avfs_table));

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -2
-			PP_ASSERT_WITH_CODE(!result,
-					"Attempt to restore VFT table

Failed!",

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -3
-					return result;);
-		}
-	}
 
 	return 0;
 }
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +0 -3
index 2685f02..7a36a74 100644
@@ -299,15 +299,6 @@ int vega10_copy_table_to_smc(struct pp_smumgr
 *smumgr,
 	return 0;
 }
 
-int vega10_perform_btc(struct pp_smumgr *smumgr)
-{
-
 	PP_ASSERT_WITH_CODE(!vega10_send_msg_to_smc_with_parame

ter(

drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +0 -6
-			smumgr, PPSMC_MSG_RunBtc, 0),
-			"Attempt to run DC BTC Failed!",
-			return -1);
-	return 0;
-}
-
 int vega10_save_vft_table(struct pp_smumgr *smumgr, uint8_t

*avfs_table)
{

drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +0 -0
 	PP_ASSERT_WITH_CODE(avfs_table,
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h +0 -1
index ad05021..71e9b64 100644
@@ -62,7 +62,6 @@ int vega10_get_smc_features(struct pp_smumgr
 *smumgr,
 		uint32_t *features_enabled);
 int vega10_save_vft_table(struct pp_smumgr *smumgr, uint8_t
 *avfs_table);
 int vega10_restore_vft_table(struct pp_smumgr *smumgr, uint8_t
 *avfs_table);
-int vega10_perform_btc(struct pp_smumgr *smumgr);

int vega10_set_tools_address(struct pp_smumgr *smumgr);

Quoted 7 lines

--
1.9.1

_______________________________________________
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