[v2,2/2] Revert "drm/amd/pm: workaround for the wrong ac power detection on smu 13.0.0"

Commit Message

Mario Limonciello Oct. 5, 2023, 5:52 p.m. UTC

This reverts commit 0e5e1a84f0b8c814d502a135824244127fed8f23.

Reviewed-by: Alex Deucher <[e-mail]>
Signed-off-by: Mario Limonciello <[e-mail]>
---
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c       | 3 ++-
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Greg KH Oct. 5, 2023, 7:12 p.m. UTC | #1

On Thu, Oct 05, 2023 at 12:52:30PM -0500, Mario Limonciello wrote:
> This reverts commit 0e5e1a84f0b8c814d502a135824244127fed8f23.
> 
> Reviewed-by: Alex Deucher <[e-mail]>
> Signed-off-by: Mario Limonciello <[e-mail]>

No explaination as to why this needs to be reverted?  And does this need
to be backported anywhere?

thanks,

greg k-h

Mario Limonciello Oct. 5, 2023, 7:15 p.m. UTC | #2

On 10/5/2023 14:12, Greg Kroah-Hartman wrote:
> On Thu, Oct 05, 2023 at 12:52:30PM -0500, Mario Limonciello wrote:
>> This reverts commit 0e5e1a84f0b8c814d502a135824244127fed8f23.
>>
>> Reviewed-by: Alex Deucher <[e-mail]>
>> Signed-off-by: Mario Limonciello <[e-mail]>
> 
> No explaination as to why this needs to be reverted?  And does this need
> to be backported anywhere?
> 
> thanks,
> 
> greg k-h

No need to be backported anywhere.  The commit is only in 
amd-staging-drm-next right now.

I think it's up to whether Alex includes the workaround commit in the 
final 6.7 pull request.  If he does, then yeah this could use a larger 
write up to explain why it went in and out.

I was sort of thinking we could land both commits amd-staging-drm-next 
and then when Alex did the pull request the workaround commit just 
wouldn't be part of the 6.7 PR since it's a no-op with the revert.

Alex Deucher Oct. 5, 2023, 7:17 p.m. UTC | #3

On Thu, Oct 5, 2023 at 3:13 PM Greg Kroah-Hartman
<[e-mail]> wrote:
>
> On Thu, Oct 05, 2023 at 12:52:30PM -0500, Mario Limonciello wrote:
> > This reverts commit 0e5e1a84f0b8c814d502a135824244127fed8f23.
> >
> > Reviewed-by: Alex Deucher <[e-mail]>
> > Signed-off-by: Mario Limonciello <[e-mail]>
>
> No explaination as to why this needs to be reverted?  And does this need
> to be backported anywhere?

This patch ultimately never went upstream, but there was some
confusion about whether it did or not.  It can be ignored.

Alex

Patch

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 08cb9f8ce64e..9b62b45ebb7f 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -1026,7 +1026,8 @@  static int smu_v13_0_process_pending_interrupt(struct smu_context *smu)
 {
 	int ret = 0;
 
-	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_ACDC_BIT))
+	if (smu->dc_controlled_by_gpio &&
+	    smu_cmn_feature_is_enabled(smu, SMU_FEATURE_ACDC_BIT))
 		ret = smu_v13_0_allow_ih_interrupt(smu);
 
 	return ret;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 07df5be063e2..0fb6be11a0cc 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -2662,6 +2662,7 @@  static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
 	.enable_mgpu_fan_boost = smu_v13_0_0_enable_mgpu_fan_boost,
 	.get_power_limit = smu_v13_0_0_get_power_limit,
 	.set_power_limit = smu_v13_0_set_power_limit,
+	.set_power_source = smu_v13_0_set_power_source,
 	.get_power_profile_mode = smu_v13_0_0_get_power_profile_mode,
 	.set_power_profile_mode = smu_v13_0_0_set_power_profile_mode,
 	.run_btc = smu_v13_0_run_btc,