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

Commit 110b20c3 authored by Austin Yuan's avatar Austin Yuan Committed by Dave Airlie
Browse files

drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c 



Signed-off-by: default avatarAustin Yuan <shengquan.yuan@gmail.com>
Acked-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent fa5829b3

drivers/gpu/drm/ttm/ttm_bo_util.c

+2 −7
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 
{

	struct ttm_tt *ttm = bo->ttm;

	struct ttm_mem_reg *old_mem = &bo->mem;

	uint32_t save_flags = old_mem->placement;

	int ret;



	if (old_mem->mem_type != TTM_PL_SYSTEM) {
@@ -62,7 +61,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 
		ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM,

				TTM_PL_MASK_MEM);

		old_mem->mem_type = TTM_PL_SYSTEM;

		save_flags = old_mem->placement;

	}



	ret = ttm_tt_set_placement_caching(ttm, new_mem->placement);
@@ -77,7 +75,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 


	*old_mem = *new_mem;

	new_mem->mm_node = NULL;

	ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE);



	return 0;

}

EXPORT_SYMBOL(ttm_bo_move_ttm);
@@ -219,7 +217,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, 
	void *old_iomap;

	void *new_iomap;

	int ret;

	uint32_t save_flags = old_mem->placement;

	unsigned long i;

	unsigned long page;

	unsigned long add = 0;
@@ -270,7 +267,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, 


	*old_mem = *new_mem;

	new_mem->mm_node = NULL;

	ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE);



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

		ttm_tt_unbind(ttm);
@@ -537,7 +533,6 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 
	struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];

	struct ttm_mem_reg *old_mem = &bo->mem;

	int ret;

	uint32_t save_flags = old_mem->placement;

	struct ttm_buffer_object *ghost_obj;

	void *tmp_obj = NULL;
@@ -598,7 +593,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 


	*old_mem = *new_mem;

	new_mem->mm_node = NULL;

	ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE);



	return 0;

}

EXPORT_SYMBOL(ttm_bo_move_accel_cleanup);