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

Commit 089f16c5 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: cleanup ttm_tt_(unbind|destroy) 



ttm_tt_destroy should be the only one unbinding the object.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 14b33074

drivers/gpu/drm/ttm/ttm_bo.c

+0 −2
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, 
out_err:

	new_man = &bdev->man[bo->mem.mem_type];

	if ((new_man->flags & TTM_MEMTYPE_FLAG_FIXED) && bo->ttm) {

		ttm_tt_unbind(bo->ttm);

		ttm_tt_destroy(bo->ttm);

		bo->ttm = NULL;

	}
@@ -419,7 +418,6 @@ static void ttm_bo_cleanup_memtype_use(struct ttm_buffer_object *bo) 
		bo->bdev->driver->move_notify(bo, NULL);



	if (bo->ttm) {

		ttm_tt_unbind(bo->ttm);

		ttm_tt_destroy(bo->ttm);

		bo->ttm = NULL;

	}

drivers/gpu/drm/ttm/ttm_bo_util.c

+0 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 
	int ret;



	if (old_mem->mem_type != TTM_PL_SYSTEM) {

		ttm_tt_unbind(ttm);

		ttm_bo_free_old_node(bo);

		ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM,

				TTM_PL_MASK_MEM);
@@ -402,7 +401,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, 
	new_mem->mm_node = NULL;



	if ((man->flags & TTM_MEMTYPE_FLAG_FIXED) && (ttm != NULL)) {

		ttm_tt_unbind(ttm);

		ttm_tt_destroy(ttm);

		bo->ttm = NULL;

	}
@@ -651,7 +649,6 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 


		if ((man->flags & TTM_MEMTYPE_FLAG_FIXED) &&

		    (bo->ttm != NULL)) {

			ttm_tt_unbind(bo->ttm);

			ttm_tt_destroy(bo->ttm);

			bo->ttm = NULL;

		}

drivers/gpu/drm/ttm/ttm_tt.c

+5 −12
Original line number Diff line number Diff line
@@ -166,11 +166,15 @@ EXPORT_SYMBOL(ttm_tt_set_placement_caching); 


void ttm_tt_destroy(struct ttm_tt *ttm)

{

	int ret;



	if (unlikely(ttm == NULL))

		return;



	if (ttm->state == tt_bound) {

		ttm_tt_unbind(ttm);

		ret = ttm->func->unbind(ttm);

		BUG_ON(ret);

		ttm->state = tt_unbound;

	}



	if (ttm->state == tt_unbound)
@@ -251,17 +255,6 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma) 
}

EXPORT_SYMBOL(ttm_dma_tt_fini);



void ttm_tt_unbind(struct ttm_tt *ttm)

{

	int ret;



	if (ttm->state == tt_bound) {

		ret = ttm->func->unbind(ttm);

		BUG_ON(ret);

		ttm->state = tt_unbound;

	}

}



int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)

{

	int ret = 0;

include/drm/ttm/ttm_bo_driver.h

+0 −9
Original line number Diff line number Diff line
@@ -622,15 +622,6 @@ extern int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem); 
 */

extern void ttm_tt_destroy(struct ttm_tt *ttm);



/**

 * ttm_ttm_unbind:

 *

 * @ttm: The struct ttm_tt.

 *

 * Unbind a struct ttm_tt.

 */

extern void ttm_tt_unbind(struct ttm_tt *ttm);



/**

 * ttm_tt_swapin:

 *