Skip to content

Commit 7f3e6b8

Browse files
Ma Junalexdeucher
authored andcommitted
drm/amd/pm: Fix error of MACO flag setting code
MACO only works if BACO is supported Signed-off-by: Ma Jun <Jun.Ma2@amd.com> Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org # 6.1.x
1 parent 9ae587f commit 7f3e6b8

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,12 @@ static int smu_v13_0_0_check_powerplay_table(struct smu_context *smu)
354354
if (powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_HARDWAREDC)
355355
smu->dc_controlled_by_gpio = true;
356356

357-
if (powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_BACO ||
358-
powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_MACO)
357+
if (powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_BACO) {
359358
smu_baco->platform_support = true;
360359

361-
if (powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_MACO)
362-
smu_baco->maco_support = true;
360+
if (powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_MACO)
361+
smu_baco->maco_support = true;
362+
}
363363

364364
if (!overdrive_lowerlimits->FeatureCtrlMask ||
365365
!overdrive_upperlimits->FeatureCtrlMask)

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,13 @@ static int smu_v13_0_7_check_powerplay_table(struct smu_context *smu)
346346
if (powerplay_table->platform_caps & SMU_13_0_7_PP_PLATFORM_CAP_HARDWAREDC)
347347
smu->dc_controlled_by_gpio = true;
348348

349-
if (powerplay_table->platform_caps & SMU_13_0_7_PP_PLATFORM_CAP_BACO ||
350-
powerplay_table->platform_caps & SMU_13_0_7_PP_PLATFORM_CAP_MACO)
349+
if (powerplay_table->platform_caps & SMU_13_0_7_PP_PLATFORM_CAP_BACO) {
351350
smu_baco->platform_support = true;
352351

353-
if (smu_baco->platform_support && (BoardTable->HsrEnabled || BoardTable->VddqOffEnabled))
354-
smu_baco->maco_support = true;
352+
if ((powerplay_table->platform_caps & SMU_13_0_7_PP_PLATFORM_CAP_MACO)
353+
&& (BoardTable->HsrEnabled || BoardTable->VddqOffEnabled))
354+
smu_baco->maco_support = true;
355+
}
355356

356357
if (!overdrive_lowerlimits->FeatureCtrlMask ||
357358
!overdrive_upperlimits->FeatureCtrlMask)

0 commit comments

Comments
 (0)