diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2023-03-31 11:15:09 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-03-31 11:15:09 -0400 |
| commit | 85b475a4502d45380c1b9223c01954daa228eeb0 (patch) | |
| tree | 2f37f9ea8519f7a101decd8a1e9ec13db051363b /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | KVM: nVMX: Do not report error code when synthesizing VM-Exit from Real Mode (diff) | |
| parent | KVM: s390: pv: fix external interruption loop not always detected (diff) | |
| download | linux-rng-85b475a4502d45380c1b9223c01954daa228eeb0.tar.xz linux-rng-85b475a4502d45380c1b9223c01954daa228eeb0.zip | |
Merge tag 'kvm-s390-master-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A small fix that repairs the external loop detection code for PV
guests.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index f5ffca24def4..ba5def374368 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2467,7 +2467,10 @@ static int amdgpu_pmops_freeze(struct device *dev) adev->in_s4 = false; if (r) return r; - return amdgpu_asic_reset(adev); + + if (amdgpu_acpi_should_gpu_reset(adev)) + return amdgpu_asic_reset(adev); + return 0; } static int amdgpu_pmops_thaw(struct device *dev) |