Commit ce747733 authored by Christian König's avatar Christian König
Browse files

drm/ttm: remove io_reserve_fastpath flag 



Just use the use_io_reserve_lru flag. It doesn't make much
sense to have two flags.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/378238/
parent 4b8edc39

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -675,7 +675,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
			}



			man->func = &nouveau_vram_manager;

			man->io_reserve_fastpath = false;

			man->use_io_reserve_lru = true;

		} else {

			man->func = &ttm_bo_manager_func;

drivers/gpu/drm/ttm/ttm_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -1521,7 +1521,6 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type, 
	BUG_ON(type >= TTM_NUM_MEM_TYPES);

	man = &bdev->man[type];

	BUG_ON(man->has_type);

	man->io_reserve_fastpath = true;

	man->use_io_reserve_lru = false;

	mutex_init(&man->io_reserve_mutex);

	spin_lock_init(&man->move_lock);

drivers/gpu/drm/ttm/ttm_bo_util.c

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ EXPORT_SYMBOL(ttm_bo_move_ttm); 


int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)

{

	if (likely(man->io_reserve_fastpath))

	if (likely(!man->use_io_reserve_lru))

		return 0;



	if (interruptible)
@@ -105,7 +105,7 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible) 


void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)

{

	if (likely(man->io_reserve_fastpath))

	if (likely(!man->use_io_reserve_lru))

		return;



	mutex_unlock(&man->io_reserve_mutex);
@@ -136,7 +136,7 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev, 


	if (!bdev->driver->io_mem_reserve)

		return 0;

	if (likely(man->io_reserve_fastpath))

	if (likely(!man->use_io_reserve_lru))

		return bdev->driver->io_mem_reserve(bdev, mem);



	if (bdev->driver->io_mem_reserve &&
@@ -157,7 +157,7 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev, 
{

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



	if (likely(man->io_reserve_fastpath))

	if (likely(!man->use_io_reserve_lru))

		return;



	if (bdev->driver->io_mem_reserve &&

include/drm/ttm/ttm_bo_driver.h

+0 −2
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ struct ttm_mem_type_manager_func { 
 * @use_io_reserve_lru: Use an lru list to try to unreserve io_mem_regions

 * reserved by the TTM vm system.

 * @io_reserve_lru: Optional lru list for unreserving io mem regions.

 * @io_reserve_fastpath: Only use bdev::driver::io_mem_reserve to obtain

 * @move_lock: lock for move fence

 * static information. bdev::driver::io_mem_free is never used.

 * @lru: The lru list for this memory type.
@@ -184,7 +183,6 @@ struct ttm_mem_type_manager { 
	void *priv;

	struct mutex io_reserve_mutex;

	bool use_io_reserve_lru;

	bool io_reserve_fastpath;

	spinlock_t move_lock;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE