diff options
| author | shaoyunl <shaoyun.liu@amd.com> | 2021-03-15 11:39:28 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-03-23 23:36:07 -0400 |
| commit | 63f3067d8f8c7a5ee4124d5833e52ae6a3a5a902 (patch) | |
| tree | 605ab2970195b2a59bda41291430e3faded79309 | |
| parent | 050743da315231c329272cb1004c1eabc1e2e715 (diff) | |
| download | linux-stable-63f3067d8f8c7a5ee4124d5833e52ae6a3a5a902.tar.gz linux-stable-63f3067d8f8c7a5ee4124d5833e52ae6a3a5a902.tar.bz2 linux-stable-63f3067d8f8c7a5ee4124d5833e52ae6a3a5a902.zip | |
drm/amd/pm: Use BACO reset arg 0 on XGMI configuration
With arg 1 BACO reset, it will try to reload the SMU FW after reset.
This might failed if driver already in a pending reset status during probe period.
Arg 0 reset will bring asic back to a clean state and driver will re-init
everythign including SMU FW
Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c index 635bd5da2133..0d137af1a78a 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c @@ -1530,7 +1530,7 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) NULL); break; default: - if (!ras || !ras->supported) { + if (!ras || !ras->supported || adev->gmc.xgmi.pending_reset) { if (adev->asic_type == CHIP_ARCTURUS) { data = RREG32_SOC15(THM, 0, mmTHM_BACO_CNTL_ARCT); data |= 0x80000000; |