Skip to content

Commit 8e02561

Browse files
John Clementsalexdeucher
authored andcommitted
amd/powerplay: arcturus baco reset disable all features
issue smu cmd to disable all features upon baco entry for arcturus to mitigate potential dirty I2C controller on boot Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: John Clements <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 31d0271 commit 8e02561

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,21 +1470,26 @@ static int smu_disable_dpm(struct smu_context *smu)
14701470
}
14711471

14721472
/*
1473-
* For baco on Arcturus, this operation
1474-
* (disable all smu feature) will be handled by SMU FW.
1473+
* Disable all enabled SMU features.
1474+
* This should be handled in SMU FW, as a backup
1475+
* driver can issue call to SMU FW until sequence
1476+
* in SMU FW is operational.
14751477
*/
1476-
if (adev->asic_type == CHIP_ARCTURUS) {
1477-
if (use_baco && (smu_version > 0x360e00))
1478-
return 0;
1479-
}
1480-
1481-
/* Disable all enabled SMU features */
14821478
ret = smu_system_features_control(smu, false);
14831479
if (ret) {
14841480
pr_err("Failed to disable smu features.\n");
14851481
return ret;
14861482
}
14871483

1484+
/*
1485+
* Arcturus does not have BACO bit in disable feature mask.
1486+
* Enablement of BACO bit on Arcturus should be skipped.
1487+
*/
1488+
if (adev->asic_type == CHIP_ARCTURUS) {
1489+
if (use_baco && (smu_version > 0x360e00))
1490+
return 0;
1491+
}
1492+
14881493
/* For baco, need to leave BACO feature enabled */
14891494
if (use_baco) {
14901495
/*

0 commit comments

Comments
 (0)