Commit cf878b2c authored by Karol Herbst's avatar Karol Herbst Committed by sanglipeng
Browse files

nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf 

stable inclusion
from stable-v5.10.166
commit 8fe3e574b3ac426ff4a11299f098e1c91538f3e5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8fe3e574b3ac426ff4a11299f098e1c91538f3e5

--------------------------------

commit 6b04ce96 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@vger.kernel.org # v5.15+
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/156


Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220819200928.401416-1-kherbst@redhat.com


Cc: Salvatore Bonaccorso <carnil@debian.org>
Cc: Computer Enthusiastic <computer.enthusiastic@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 334e392f

drivers/gpu/drm/nouveau/nouveau_bo.c

+9 −0
Original line number Diff line number Diff line
@@ -823,6 +823,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr, 
		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,