drm/ttm: use a helper for unlocked moves to the lru tail (20784cdf) · Commits · 戴 / test

drivers/gpu/drm/ttm/ttm_bo.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -1101,9 +1101,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,

		error:
		if (bo->mem.mem_type == TTM_PL_SYSTEM && !list_empty(&bo->lru)) {
		spin_lock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail(bo, NULL);
		spin_unlock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail_unlocked(bo);
		}

		return ret;
		@@ -1318,9 +1316,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
		return ret;
		}

		spin_lock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail(bo, NULL);
		spin_unlock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail_unlocked(bo);

		return ret;
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -306,9 +306,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
		}

		if (bo->moving != moving) {
		spin_lock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail(bo, NULL);
		spin_unlock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail_unlocked(bo);
		}
		dma_fence_put(moving);
		}

+8 −3

Original line number	Diff line number	Diff line
		@@ -669,6 +669,13 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
		return 0;
		}

		static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo)
		{
		spin_lock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail(bo, NULL);
		spin_unlock(&ttm_bo_glob.lru_lock);
		}

		/**
		* ttm_bo_unreserve
		*
		@@ -678,9 +685,7 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
		*/
		static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
		{
		spin_lock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail(bo, NULL);
		spin_unlock(&ttm_bo_glob.lru_lock);
		ttm_bo_move_to_lru_tail_unlocked(bo);
		dma_resv_unlock(bo->base.resv);
		}