drm/nouveau: fix multihop when move doesn't work.
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 drm/nouveau: fix multihop when move doesn't work.
From: Dave Airlie <[email protected]>
As per the radeon/amdgpu fix don't use multihop is hw moves aren't enabled.
Reported-by Mike Galbraith <[email protected]>
Tested-by Mike Galbraith <[email protected]>
Fixes 0c8c0659d74 ("drm/nouveau/ttm: use multihop")
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 31 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +16 -15
@@ -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 ; -/* Fallback to software copy. */ - ret =ttm_bo_move_memcpy (bo, ctx, new_reg); +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 ) {
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Dave Airlie
From: Dave Airlie <[email protected]>
As per the radeon/amdgpu fix don't use multihop is hw moves aren't enabled.
Reported-by Mike Galbraith <[email protected]>Tested-by Mike Galbraith <[email protected]>Fixes 0c8c0659d74 ("drm/nouveau/ttm: use multihop")Signed-off-by Dave Airlie <[email protected]>
Pulled to drm-next directly, will go out to Linus tomorrow. -Daniel
Quoted 63 lines
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 31 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/nouveau/nouveau_bo.c +16
-15@@ -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 ; -/* Fallback to software copy. */ - ret =ttm_bo_move_memcpy (bo, ctx, new_reg); +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 ) {Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Dave Airlie
From: Dave Airlie <[email protected]>
As per the radeon/amdgpu fix don't use multihop is hw moves aren't enabled.
Reported-by Mike Galbraith <[email protected]>Tested-by Mike Galbraith <[email protected]>Fixes 0c8c0659d74 ("drm/nouveau/ttm: use multihop")
Also fixed the Fixes: line here, it was pointing at something else (old rebased version from your own tree maybe?).
-Daniel
Quoted 73 lines
Quoted 1 line
Signed-off-by Dave Airlie <[email protected]>Pulled to drm-next directly, will go out to Linus tomorrow. -Daniel
Quoted 63 lines
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 31 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/nouveau/nouveau_bo.c +16
-15@@ -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 ; -/* Fallback to software copy. */ - ret =ttm_bo_move_memcpy (bo, ctx, new_reg); +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 ) {Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-develSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel