drm/ttm: add ttm_tt_populate wrapper (25893a14) · Commits · 戴 / test

drivers/gpu/drm/ttm/ttm_bo_util.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -375,8 +375,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
		/*
		* TTM might be null for moves within the same region.
		*/
		if (ttm && ttm->state == tt_unpopulated) {
		ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
		if (ttm) {
		ret = ttm_tt_populate(ttm, ctx);
		if (ret)
		goto out1;
		}
		@@ -557,11 +557,9 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,

		BUG_ON(!ttm);

		if (ttm->state == tt_unpopulated) {
		ret = ttm->bdev->driver->ttm_tt_populate(ttm, &ctx);
		ret = ttm_tt_populate(ttm, &ctx);
		if (ret)
		return ret;
		}

		if (num_pages == 1 && (mem->placement & TTM_PL_FLAG_CACHED)) {
		/*

+1 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ static int ttm_bo_vm_fault(struct vm_fault *vmf)
		cvma.vm_page_prot);

		/* Allocate all page at once, most common usage */
		if (ttm->bdev->driver->ttm_tt_populate(ttm, &ctx)) {
		if (ttm_tt_populate(ttm, &ctx)) {
		ret = VM_FAULT_OOM;
		goto out_io_unlock;
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ int ttm_tt_bind(struct ttm_tt ttm, struct ttm_mem_reg bo_mem,
		if (ttm->state == tt_bound)
		return 0;

		ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
		ret = ttm_tt_populate(ttm, ctx);
		if (ret)
		return ret;

		@@ -392,6 +392,14 @@ out_err:
		return ret;
		}

		int ttm_tt_populate(struct ttm_tt ttm, struct ttm_operation_ctx ctx)
		{
		if (ttm->state != tt_unpopulated)
		return 0;

		return ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
		}

		static void ttm_tt_clear_mapping(struct ttm_tt *ttm)
		{
		pgoff_t i;

+9 −0

Original line number	Diff line number	Diff line
		@@ -700,6 +700,15 @@ int ttm_tt_swapin(struct ttm_tt *ttm);
		int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement);
		int ttm_tt_swapout(struct ttm_tt ttm, struct file persistent_swap_storage);

		/**
		* ttm_tt_populate - allocate pages for a ttm
		*
		* @ttm: Pointer to the ttm_tt structure
		*
		* Calls the driver method to allocate pages for a ttm
		*/
		int ttm_tt_populate(struct ttm_tt ttm, struct ttm_operation_ctx ctx);

		/**
		* ttm_tt_unpopulate - free pages from a ttm
		*