Skip to contentSkip to conversation

Fix powerplay merge errors

PATCH In review Tom St Denis 2 participants 4 messages Oct 2, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

PATCH 1/2 drm/amd/powerplay: Fix bug introduced by 38d794ae060df6cf5bf2caa4742e379a45bcc018

---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +2 -2
index 97cafdb23056..598a194737a9 100644
@@ -1243,7 +1243,7 @@ int vega10_enable_didt_config(struct pp_hwmgr *hwmgr)
 		}
 
 		if (0 == result) {
-			result = vega10_enable_smc_features(hwmgr->smumgr, true, data->smu_features[GNLD_DIDT].smu_feature_bitmap);
+			result = vega10_enable_smc_features(hwmgr, true, data->smu_features[GNLD_DIDT].smu_feature_bitmap);
 			PP_ASSERT_WITH_CODE((0 == result), "[EnableDiDtConfig] Attempt to Enable DiDt feature Failed!", return result);
 			data->smu_features[GNLD_DIDT].enabled = true;
 		}
@@ -1290,7 +1290,7 @@ int vega10_disable_didt_config(struct pp_hwmgr *hwmgr)
 		}
 
 		if (0 == result) {
-			result = vega10_enable_smc_features(hwmgr->smumgr, false, data->smu_features[GNLD_DIDT].smu_feature_bitmap);
+			result = vega10_enable_smc_features(hwmgr, false, data->smu_features[GNLD_DIDT].smu_feature_bitmap);
 			PP_ASSERT_WITH_CODE((0 == result), "[DisableDiDtConfig] Attempt to Disable DiDt feature Failed!", return result);
 			data->smu_features[GNLD_DIDT].enabled = false;
 		}
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw

PATCH 2/2 drm/amd/powerplay: Fix powerplay bugs

In reply to a message not in the archive

Introduced by commits:
cf5235684f9736278f395d1668876000490120d2
7401d47185deaa63f23553c6680ae4a4c0824595
f174394486e1b575933856cfc2b60526d1ac5788

---
 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +12 -12
index 513532819517..938010842c7d 100644
@@ -421,21 +421,21 @@ static int rv_populate_clock_table(struct pp_hwmgr *hwmgr)
 	rv_get_clock_voltage_dependency_table(hwmgr, &pinfo->vdd_dep_on_phyclk,
 					ARRAY_SIZE(VddPhyClk), &VddPhyClk[0]);
 
-	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr->smumgr,
+	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 			PPSMC_MSG_GetMinGfxclkFrequency),
 			"Attempt to get min GFXCLK Failed!",
 			return -1);
-	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr->smumgr,
+	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 			&result),
 			"Attempt to get min GFXCLK Failed!",
 			return -1);
 	rv_data->gfx_min_freq_limit = result * 100;
 
-	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr->smumgr,
+	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 			PPSMC_MSG_GetMaxGfxclkFrequency),
 			"Attempt to get max GFXCLK Failed!",
 			return -1);
-	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr->smumgr,
+	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 			&result),
 			"Attempt to get max GFXCLK Failed!",
 			return -1);
@@ -626,11 +626,11 @@ static int rv_print_clock_levels(struct pp_hwmgr *hwmgr,
 
 	switch (type) {
 	case PP_SCLK:
-		PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr->smumgr,
+		PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 				PPSMC_MSG_GetGfxclkFrequency),
 				"Attempt to get current GFXCLK Failed!",
 				return -1);
-		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr->smumgr,
+		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 				&now),
 				"Attempt to get current GFXCLK Failed!",
 				return -1);
@@ -645,11 +645,11 @@ static int rv_print_clock_levels(struct pp_hwmgr *hwmgr,
 				 == now) ? "*" : "");
 		break;
 	case PP_MCLK:
-		PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr->smumgr,
+		PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 				PPSMC_MSG_GetFclkFrequency),
 				"Attempt to get current MEMCLK Failed!",
 				return -1);
-		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr->smumgr,
+		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 				&now),
 				"Attempt to get current MEMCLK Failed!",
 				return -1);
@@ -901,18 +901,18 @@ static int rv_read_sensor(struct pp_hwmgr *hwmgr, int idx,
 
 	switch (idx) {
 	case AMDGPU_PP_SENSOR_GFX_SCLK:
-		ret = smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_GetGfxclkFrequency);
+		ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetGfxclkFrequency);
 		if (!ret) {
-			rv_read_arg_from_smc(hwmgr->smumgr, &sclk);
+			rv_read_arg_from_smc(hwmgr, &sclk);
 			/* in units of 10KHZ */
 			*((uint32_t *)value) = sclk * 100;
 			*size = 4;
 		}
 		break;
 	case AMDGPU_PP_SENSOR_GFX_MCLK:
-		ret = smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_GetFclkFrequency);
+		ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetFclkFrequency);
 		if (!ret) {
-			rv_read_arg_from_smc(hwmgr->smumgr, &mclk);
+			rv_read_arg_from_smc(hwmgr, &mclk);
 			/* in units of 10KHZ */
 			*((uint32_t *)value) = mclk * 100;
 			*size = 4;
Signature · 6 lines
2.12.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]

Reviewed-by Alex Deucher
#5 lore raw

RE: [PATCH 2/2] drm/amd/powerplay: Fix powerplay bugs

Quoted 8 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Monday, October 02, 2017 10:28 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 2/2] drm/amd/powerplay: Fix powerplay bugs

Quoted 6 lines

Introduced by commits:
cf5235684f9736278f395d1668876000490120d2
7401d47185deaa63f23553c6680ae4a4c0824595
f174394486e1b575933856cfc2b60526d1ac5788

Series is:

Quoted 110 lines
---
 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 24 ++++++++++++-
-----------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +3 -3
index 513532819517..938010842c7d 100644
@@ -421,21 +421,21 @@ static int rv_populate_clock_table(struct
 pp_hwmgr *hwmgr)
 	rv_get_clock_voltage_dependency_table(hwmgr, &pinfo-
 >vdd_dep_on_phyclk,
 					ARRAY_SIZE(VddPhyClk),
 &VddPhyClk[0]);
 
-	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr-
 >smumgr,
+	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 			PPSMC_MSG_GetMinGfxclkFrequency),
 			"Attempt to get min GFXCLK Failed!",
 			return -1);
-	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr->smumgr,
+	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 			&result),
 			"Attempt to get min GFXCLK Failed!",
 			return -1);
 	rv_data->gfx_min_freq_limit = result * 100;
 
-	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr-
 >smumgr,
+	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 			PPSMC_MSG_GetMaxGfxclkFrequency),
 			"Attempt to get max GFXCLK Failed!",
drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +2 -3
 			return -1);
-	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr->smumgr,
+	PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 			&result),
 			"Attempt to get max GFXCLK Failed!",
 			return -1);
@@ -626,11 +626,11 @@ static int rv_print_clock_levels(struct pp_hwmgr
 *hwmgr,
 
 	switch (type) {
 	case PP_SCLK:
-
 	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr-
 >smumgr,
+
 	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 				PPSMC_MSG_GetGfxclkFrequency),
 				"Attempt to get current GFXCLK Failed!",
 				return -1);
-		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr-
Quoted 1 line

smumgr,

drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +2 -2
+		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 				&now),
 				"Attempt to get current GFXCLK Failed!",
 				return -1);
@@ -645,11 +645,11 @@ static int rv_print_clock_levels(struct pp_hwmgr
 *hwmgr,
 				 == now) ? "*" : "");
 		break;
 	case PP_MCLK:
-
 	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr-
 >smumgr,
+
 	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,
 				PPSMC_MSG_GetFclkFrequency),
 				"Attempt to get current MEMCLK Failed!",
 				return -1);
-		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr-
Quoted 1 line

smumgr,

drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +4 -3
+		PP_ASSERT_WITH_CODE(!rv_read_arg_from_smc(hwmgr,
 				&now),
 				"Attempt to get current MEMCLK Failed!",
 				return -1);
@@ -901,18 +901,18 @@ static int rv_read_sensor(struct pp_hwmgr
 *hwmgr, int idx,
 
 	switch (idx) {
 	case AMDGPU_PP_SENSOR_GFX_SCLK:
-		ret = smum_send_msg_to_smc(hwmgr->smumgr,
 PPSMC_MSG_GetGfxclkFrequency);
+		ret = smum_send_msg_to_smc(hwmgr,
 PPSMC_MSG_GetGfxclkFrequency);
 		if (!ret) {
-			rv_read_arg_from_smc(hwmgr->smumgr, &sclk);
+			rv_read_arg_from_smc(hwmgr, &sclk);
 			/* in units of 10KHZ */
 			*((uint32_t *)value) = sclk * 100;
 			*size = 4;
 		}
 		break;
 	case AMDGPU_PP_SENSOR_GFX_MCLK:
-		ret = smum_send_msg_to_smc(hwmgr->smumgr,
 PPSMC_MSG_GetFclkFrequency);
+		ret = smum_send_msg_to_smc(hwmgr,
 PPSMC_MSG_GetFclkFrequency);
drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +1 -2
 		if (!ret) {
-			rv_read_arg_from_smc(hwmgr->smumgr, &mclk);
+			rv_read_arg_from_smc(hwmgr, &mclk);
 			/* in units of 10KHZ */
 			*((uint32_t *)value) = mclk * 100;
 			*size = 4;
--

2.12.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