* [PATCH] drm/amdgpu: fix suspend/resume hang regression
@ 2022-03-01 6:26 Qiang Yu
2022-03-01 7:48 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Qiang Yu @ 2022-03-01 6:26 UTC (permalink / raw)
To: Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
Daniel Vetter, Qiang Yu, Paul Menzel
Cc: amd-gfx, dri-devel, linux-kernel
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 <qiang.yu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 2cd9f1a2e5fa..fc4563cf2828 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -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);
}
/**
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] drm/amdgpu: fix suspend/resume hang regression
2022-03-01 6:26 [PATCH] drm/amdgpu: fix suspend/resume hang regression Qiang Yu
@ 2022-03-01 7:48 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2022-03-01 7:48 UTC (permalink / raw)
To: Qiang Yu, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter, Paul Menzel
Cc: dri-devel, amd-gfx, linux-kernel
Am 01.03.22 um 07:26 schrieb Qiang Yu:
> 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 <qiang.yu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: <stable@vger.kernel.org>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 2cd9f1a2e5fa..fc4563cf2828 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -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);
> }
>
> /**
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-01 7:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 6:26 [PATCH] drm/amdgpu: fix suspend/resume hang regression Qiang Yu
2022-03-01 7:48 ` Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®