Merge tag 'amd-drm-fixes-5.17-2022-03-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes

airlied · airlied · commit c9585249c245 · 2022-03-04T13:02:13.000+10:00
amd-drm-fixes-5.17-2022-03-02: amdgpu: - Suspend regression fix Signed-off-by: Dave Airlie <airlied@redhat.com> From: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220303045035.5650-1-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`	`/**`