Commit 660a5995 authored by Dave Airlie's avatar Dave Airlie Committed by Daniel Vetter
Browse files

drm/nouveau: fix multihop when move doesn't work. 



As per the radeon/amdgpu fix don't use multihop if hw moves
aren't enabled.

Reported-by: default avatarMike Galbraith <efault@gmx.de>
Tested-by: default avatarMike Galbraith <efault@gmx.de>
Fixes: 0c8c0659 ("drm/nouveau/ttm: use multihop")
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201217200943.30511-1-airlied@gmail.com
parent efd30437

drivers/gpu/drm/nouveau/nouveau_bo.c

+16 −15
Original line number Diff line number Diff line
@@ -942,16 +942,6 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct nouveau_drm_tile *new_tile = NULL;

	int ret = 0;



	if ((old_reg->mem_type == TTM_PL_SYSTEM &&

	     new_reg->mem_type == TTM_PL_VRAM) ||

	    (old_reg->mem_type == TTM_PL_VRAM &&

	     new_reg->mem_type == TTM_PL_SYSTEM)) {

		hop->fpfn = 0;

		hop->lpfn = 0;

		hop->mem_type = TTM_PL_TT;

		hop->flags = 0;

		return -EMULTIHOP;

	}



	if (new_reg->mem_type == TTM_PL_TT) {

		ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, new_reg);
@@ -995,14 +985,25 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 


	/* Hardware assisted copy. */

	if (drm->ttm.move) {

		if ((old_reg->mem_type == TTM_PL_SYSTEM &&

		     new_reg->mem_type == TTM_PL_VRAM) ||

		    (old_reg->mem_type == TTM_PL_VRAM &&

		     new_reg->mem_type == TTM_PL_SYSTEM)) {

			hop->fpfn = 0;

			hop->lpfn = 0;

			hop->mem_type = TTM_PL_TT;

			hop->flags = 0;

			return -EMULTIHOP;

		}

		ret = nouveau_bo_move_m2mf(bo, evict, ctx,

					   new_reg);

		if (!ret)

			goto out;

	}

	} else

		ret = -ENODEV;



	if (ret) {

		/* Fallback to software copy. */

		ret = ttm_bo_move_memcpy(bo, ctx, new_reg);

	}



out:

	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE