Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 311ab694 authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Move the fence wait before migration resource clean-up. 



Avoids an oops in the fence wait failure path (bug 26521).

Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Tested-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d3f12da1

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −3
Original line number Diff line number Diff line
@@ -461,9 +461,9 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan, 
		return ret;



	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,

					evict, no_wait_reserve, no_wait_gpu, new_mem);

	if (nvbo->channel && nvbo->channel != chan)

		ret = nouveau_fence_wait(fence, NULL, false, false);

					evict || (nvbo->channel &&

						  nvbo->channel != chan),

					no_wait_reserve, no_wait_gpu, new_mem);

	nouveau_fence_unref((void *)&fence);

	return ret;

}