This is a note to let you know that I've just added the patch titled
nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nouveau-explicitly-wait-on-the-fence-in-nouveau_bo_move_m2mf.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6b04ce966a738ecdd9294c9593e48513c0dc90aa Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@xxxxxxxxxx>
Date: Fri, 19 Aug 2022 22:09:28 +0200
Subject: nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf
From: Karol Herbst <kherbst@xxxxxxxxxx>
commit 6b04ce966a738ecdd9294c9593e48513c0dc90aa upstream.
It is a bit unlcear to us why that's helping, but it does and unbreaks
suspend/resume on a lot of GPUs without any known drawbacks.
Cc: stable@xxxxxxxxxxxxxxx # v5.15+
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/156
Signed-off-by: Karol Herbst <kherbst@xxxxxxxxxx>
Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20220819200928.401416-1-kherbst@xxxxxxxxxx
Cc: Salvatore Bonaccorso <carnil@xxxxxxxxxx>
Cc: Computer Enthusiastic <computer.enthusiastic@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -823,6 +823,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_o
if (ret == 0) {
ret = nouveau_fence_new(chan, false, &fence);
if (ret == 0) {
+ /* TODO: figure out a better solution here
+ *
+ * wait on the fence here explicitly as going through
+ * ttm_bo_move_accel_cleanup somehow doesn't seem to do it.
+ *
+ * Without this the operation can timeout and we'll fallback to a
+ * software copy, which might take several minutes to finish.
+ */
+ nouveau_fence_wait(fence, false, false);
ret = ttm_bo_move_accel_cleanup(bo,
&fence->base,
evict, false,
Patches currently in stable-queue which might be from kherbst@xxxxxxxxxx are
queue-5.10/nouveau-explicitly-wait-on-the-fence-in-nouveau_bo_move_m2mf.patch
