From: Alex Deucher <alexander.deucher@xxxxxxx> commit ebc002e3ee78409c42156e62e4e27ad1d09c5a75 upstream. Seems to cause a reboots or hangs on some systems. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1924 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1953 Fixes: daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)") Reviewed-by: Lijo Lazar <lijo.lazar@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c @@ -1045,6 +1045,17 @@ bool amdgpu_dpm_is_baco_supported(struct if (!pp_funcs || !pp_funcs->get_asic_baco_capability) return false; + /* Don't use baco for reset in S3. + * This is a workaround for some platforms + * where entering BACO during suspend + * seems to cause reboots or hangs. + * This might be related to the fact that BACO controls + * power to the whole GPU including devices like audio and USB. + * Powering down/up everything may adversely affect these other + * devices. Needs more investigation. + */ + if (adev->in_s3) + return false; if (pp_funcs->get_asic_baco_capability(pp_handle, &baco_cap)) return false; Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-5.15/drm-amdgpu-display-change-pipe-policy-for-dcn-2.1.patch queue-5.15/drm-amdkfd-make-crat-table-missing-message-informati.patch queue-5.15/drm-amdkfd-don-t-take-process-mutex-for-svm-ioctls.patch queue-5.15/drm-amdgpu-smu10-fix-soc-fclk-units-in-auto-mode.patch queue-5.15/amd-display-set-backlight-only-if-required.patch queue-5.15/drm-amdgpu-fix-recursive-locking-warning.patch queue-5.15/drm-amdgpu-fix-off-by-one-in-amdgpu_gfx_kiq_acquire.patch queue-5.15/drm-amd-display-add-signal-type-check-when-verify-st.patch queue-5.15/drm-amdkfd-create-file-descriptor-after-client-is-added-to-smi_clients-list.patch queue-5.15/drm-amdgpu-vcn-fix-the-register-setting-for-vcn1.patch queue-5.15/fbdev-fix-unregistering-of-framebuffers-without-device.patch queue-5.15/drm-amd-display-fix-memory-leak.patch queue-5.15/drm-amd-amdgpu-amdgpu_cs-fix-refcount-leak-of-a-dma_.patch queue-5.15/drm-amdgpu-don-t-use-baco-for-reset-in-s3.patch queue-5.15/drm-amd-display-use-psr-version-selected-during-set_.patch
