Commit 13a8f46d authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: move ghost object creation to a common function 



Both accel cleanup and pipeline move had the same code, make
a single function for it.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200917043040.146575-7-airlied@gmail.com
parent 2ee476f7

drivers/gpu/drm/ttm/ttm_bo_util.c

+42 −62
Original line number Diff line number Diff line
@@ -526,26 +526,13 @@ void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map) 
}

EXPORT_SYMBOL(ttm_bo_kunmap);



int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,

static int ttm_bo_move_to_ghost(struct ttm_buffer_object *bo,

				struct dma_fence *fence,

			      bool evict,

			      struct ttm_resource *new_mem)

				bool dst_use_tt)

{

	struct ttm_bo_device *bdev = bo->bdev;

	struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);

	int ret;

	struct ttm_buffer_object *ghost_obj;

	int ret;



	dma_resv_add_excl_fence(bo->base.resv, fence);

	if (evict) {

		ret = ttm_bo_wait(bo, false, false);

		if (ret)

			return ret;



		if (!man->use_tt)

			ttm_bo_tt_destroy(bo);

		ttm_bo_free_old_node(bo);

	} else {

	/**

	 * This should help pipeline ordinary buffer moves.

	 *
@@ -569,14 +556,38 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 
	 * bo to be unbound and destroyed.

	 */



		if (man->use_tt) {

	if (dst_use_tt)

		ghost_obj->ttm = NULL;

		} else {

	else

		bo->ttm = NULL;

		}



	dma_resv_unlock(&ghost_obj->base._resv);

	ttm_bo_put(ghost_obj);

	return 0;

}



int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,

			      struct dma_fence *fence,

			      bool evict,

			      struct ttm_resource *new_mem)

{

	struct ttm_bo_device *bdev = bo->bdev;

	struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);

	int ret;



	dma_resv_add_excl_fence(bo->base.resv, fence);

	if (evict) {

		ret = ttm_bo_wait(bo, false, false);

		if (ret)

			return ret;



		if (!man->use_tt)

			ttm_bo_tt_destroy(bo);

		ttm_bo_free_old_node(bo);

	} else {

		ret = ttm_bo_move_to_ghost(bo, fence, man->use_tt);

		if (ret)

			return ret;

	}



	ttm_bo_assign_mem(bo, new_mem);
@@ -599,40 +610,9 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, 
	dma_resv_add_excl_fence(bo->base.resv, fence);



	if (!evict) {

		struct ttm_buffer_object *ghost_obj;



		/**

		 * This should help pipeline ordinary buffer moves.

		 *

		 * Hang old buffer memory on a new buffer object,

		 * and leave it to be released when the GPU

		 * operation has completed.

		 */



		dma_fence_put(bo->moving);

		bo->moving = dma_fence_get(fence);



		ret = ttm_buffer_object_transfer(bo, &ghost_obj);

		ret = ttm_bo_move_to_ghost(bo, fence, to->use_tt);

		if (ret)

			return ret;



		dma_resv_add_excl_fence(&ghost_obj->base._resv, fence);



		/**

		 * If we're not moving to fixed memory, the TTM object

		 * needs to stay alive. Otherwhise hang it on the ghost

		 * bo to be unbound and destroyed.

		 */



		if (to->use_tt) {

			ghost_obj->ttm = NULL;

		} else {

			bo->ttm = NULL;

		}



		dma_resv_unlock(&ghost_obj->base._resv);

		ttm_bo_put(ghost_obj);



	} else if (!from->use_tt) {



		/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE