Commit e8d6d6f0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'amd-drm-fixes-6.3-2023-03-30' of... 

Merge tag 'amd-drm-fixes-6.3-2023-03-30' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.3-2023-03-30:

amdgpu:
- Hibernation regression fix

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230330153859.18332-1-alexander.deucher@amd.com
parents 69620d5c 2fec9dc8

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

+6 −1
Original line number Diff line number Diff line
@@ -981,7 +981,12 @@ static bool amdgpu_atcs_pci_probe_handle(struct pci_dev *pdev) 
 */

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

	if ((adev->flags & AMD_IS_APU) &&

	    adev->gfx.imu.funcs) /* Not need to do mode2 reset for IMU enabled APUs */

		return false;



	if ((adev->flags & AMD_IS_APU) &&

	    amdgpu_acpi_is_s3_active(adev))

		return false;



	if (amdgpu_sriov_vf(adev))