Skip to content

Commit 6b04ce9

Browse files
committed
nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf
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: Karol Herbst <kherbst@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220819200928.401416-1-kherbst@redhat.com
1 parent ea2aa97 commit 6b04ce9

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/gpu/drm/nouveau/nouveau_bo.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
820820
if (ret == 0) {
821821
ret = nouveau_fence_new(chan, false, &fence);
822822
if (ret == 0) {
823+
/* TODO: figure out a better solution here
824+
*
825+
* wait on the fence here explicitly as going through
826+
* ttm_bo_move_accel_cleanup somehow doesn't seem to do it.
827+
*
828+
* Without this the operation can timeout and we'll fallback to a
829+
* software copy, which might take several minutes to finish.
830+
*/
831+
nouveau_fence_wait(fence, false, false);
823832
ret = ttm_bo_move_accel_cleanup(bo,
824833
&fence->base,
825834
evict, false,

0 commit comments

Comments
 (0)