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

Commit c1b90df2 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nv50: use correct tiling methods for m2mf buffer moves 



Currently used only on original nv50, nvaa and nvac.

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2b77c1c0

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
		stride  = 16 * 4;

		height  = amount / stride;



		if (new_mem->mem_type == TTM_PL_VRAM &&

		if (old_mem->mem_type == TTM_PL_VRAM &&

		    nouveau_bo_tile_layout(nvbo)) {

			ret = RING_SPACE(chan, 8);

			if (ret)
@@ -823,7 +823,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
			BEGIN_NV04(chan, NvSubCopy, 0x0200, 1);

			OUT_RING  (chan, 1);

		}

		if (old_mem->mem_type == TTM_PL_VRAM &&

		if (new_mem->mem_type == TTM_PL_VRAM &&

		    nouveau_bo_tile_layout(nvbo)) {

			ret = RING_SPACE(chan, 8);

			if (ret)