diff options
| author | Qiang Yu <qiang.yu@amd.com> | 2022-03-01 14:11:59 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-08 19:12:52 +0100 |
| commit | 46eed3a37dee87b9c35c7419e1820797121893a0 (patch) | |
| tree | ba8bb012b9a3b96e43cb2c07ca9ddf881c61d583 | |
| parent | a1e603e5f3b206c820fc6aa983fed7ed64020f4e (diff) | |
| download | linux-stable-46eed3a37dee87b9c35c7419e1820797121893a0.tar.gz linux-stable-46eed3a37dee87b9c35c7419e1820797121893a0.tar.bz2 linux-stable-46eed3a37dee87b9c35c7419e1820797121893a0.zip | |
drm/amdgpu: fix suspend/resume hang regression
[ Upstream commit f1ef17011c765495c876fa75435e59eecfdc1ee4 ]
Regression has been reported that suspend/resume may hang with
the previous vm ready check commit.
So bring back the evicted list check as a temp fix.
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1922
Fixes: c1a66c3bc425 ("drm/amdgpu: check vm ready by amdgpu_vm->evicting flag")
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Qiang Yu <qiang.yu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index a33cb2f4d744..fd37bb39774c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -777,7 +777,8 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm) amdgpu_vm_eviction_lock(vm); ret = !vm->evicting; amdgpu_vm_eviction_unlock(vm); - return ret; + + return ret && list_empty(&vm->evicted); } /** |