Commit c9220b0f authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: add unlocked variant of new manager put node. 



We need the unlocked variant for the new codepath introduced to fix the
race condition in master recently.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b7ae5056

drivers/gpu/drm/ttm/ttm_bo.c

+10 −3
Original line number Diff line number Diff line
@@ -464,9 +464,7 @@ static void ttm_bo_cleanup_memtype_use(struct ttm_buffer_object *bo) 
		spin_lock(&glob->lru_lock);

	}



	if (bo->mem.mm_node) {

		ttm_bo_mem_put(bo, &bo->mem);

	}

	ttm_bo_mem_put_locked(bo, &bo->mem);



	atomic_set(&bo->reserved, 0);

	wake_up_all(&bo->event_queue);
@@ -791,6 +789,15 @@ void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem) 
}

EXPORT_SYMBOL(ttm_bo_mem_put);



void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem)

{

	struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];



	if (mem->mm_node)

		(*man->func->put_node_locked)(man, mem);

}

EXPORT_SYMBOL(ttm_bo_mem_put_locked);



/**

 * Repeatedly evict memory from the LRU for @mem_type until we create enough

 * space, or we've evicted everything and there isn't enough space.

drivers/gpu/drm/ttm/ttm_bo_manager.c

+10 −0
Original line number Diff line number Diff line
@@ -90,6 +90,15 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man, 
	}

}



static void ttm_bo_man_put_node_locked(struct ttm_mem_type_manager *man,

				       struct ttm_mem_reg *mem)

{

	if (mem->mm_node) {

		drm_mm_put_block(mem->mm_node);

		mem->mm_node = NULL;

	}

}



static int ttm_bo_man_init(struct ttm_mem_type_manager *man,

			   unsigned long p_size)

{
@@ -143,6 +152,7 @@ const struct ttm_mem_type_manager_func ttm_bo_manager_func = { 
	ttm_bo_man_takedown,

	ttm_bo_man_get_node,

	ttm_bo_man_put_node,

	ttm_bo_man_put_node_locked,

	ttm_bo_man_debug

};

EXPORT_SYMBOL(ttm_bo_manager_func);

include/drm/ttm/ttm_bo_driver.h

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ struct ttm_mem_type_manager_func { 
			 struct ttm_mem_reg *mem);

	void (*put_node)(struct ttm_mem_type_manager *man,

			 struct ttm_mem_reg *mem);

	void (*put_node_locked)(struct ttm_mem_type_manager *man,

				struct ttm_mem_reg *mem);

	void (*debug)(struct ttm_mem_type_manager *man, const char *prefix);

};
@@ -667,6 +669,8 @@ extern int ttm_bo_mem_space(struct ttm_buffer_object *bo, 


extern void ttm_bo_mem_put(struct ttm_buffer_object *bo,

			   struct ttm_mem_reg *mem);

extern void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo,

				  struct ttm_mem_reg *mem);



/**

 * ttm_bo_wait_for_cpu