drm/amdgpu: fix suspend/resume hang regression
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix suspend/resume hang regression
Regression has been reported that suspend/resume may hang with the previous vm ready check commit:
https://gitlab.freedesktop.org/drm/amd/-/issues/1915#note_1278198
So bring back the evicted list check as a temp fix.
Fixes cc8dd2cc1a97 ("drm/amdgpu: check vm ready by amdgpu_vm->evicting flag")
Signed-off-by Qiang Yu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -1
@@ -779,7 +779,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); }/**
Signature · 1 line
2.25.1
Am 01.03.22 um 07:26 schrieb Qiang Yu:
Quoted 8 lines
Regression has been reported that suspend/resume may hang with the previous vm ready check commit:
https://gitlab.freedesktop.org/drm/amd/-/issues/1915#note_1278198So bring back the evicted list check as a temp fix.
Fixes cc8dd2cc1a97 ("drm/amdgpu: check vm ready by amdgpu_vm->evicting flag")Signed-off-by Qiang Yu <[email protected]>
Reviewed-by Christian König <[email protected]>
Cc <[email protected]>
Quoted 18 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2
-1@@ -779,7 +779,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); }/**