drm/amdgpu: fix suspend/resume hang regression

yuq · alexdeucher · commit f1ef17011c76 · 2022-03-02T18:36:43.000-05:00
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: c1a66c3 ("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>
diff --git 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);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,8 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm)`
`777`	`777`	`amdgpu_vm_eviction_lock(vm);`
`778`	`778`	`ret = !vm->evicting;`
`779`	`779`	`amdgpu_vm_eviction_unlock(vm);`
`780`		`- return ret;`
	`780`	`+`
	`781`	`+ return ret && list_empty(&vm->evicted);`
`781`	`782`	`}`
`782`	`783`
`783`	`784`	`/**`