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

Commit 279c01f6 authored by Roger He's avatar Roger He Committed by Alex Deucher
Browse files

drm/ttm: use an operation ctx for ttm_mem_global_alloc 



forward the operation context to ttm_mem_global_alloc as well, and the
ultimate goal is swapout enablement for reserved BOs

Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRoger He <Hongbo.He@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6c26af8

drivers/gpu/drm/ttm/ttm_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, 
	struct ttm_mem_global *mem_glob = bdev->glob->mem_glob;

	bool locked;



	ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);

	ret = ttm_mem_global_alloc(mem_glob, acc_size, ctx);

	if (ret) {

		pr_err("Out of kernel memory\n");

		if (destroy)

drivers/gpu/drm/ttm/ttm_memory.c

+9 −6
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int ttm_mem_global_reserve(struct ttm_mem_global *glob, 
static int ttm_mem_global_alloc_zone(struct ttm_mem_global *glob,

				     struct ttm_mem_zone *single_zone,

				     uint64_t memory,

				     bool no_wait, bool interruptible)

				     struct ttm_operation_ctx *ctx)

{

	int count = TTM_MEMORY_ALLOC_RETRIES;
@@ -516,7 +516,7 @@ static int ttm_mem_global_alloc_zone(struct ttm_mem_global *glob, 
					       single_zone,

					       memory, true)

			!= 0)) {

		if (no_wait)

		if (ctx->no_wait_gpu)

			return -ENOMEM;

		if (unlikely(count-- == 0))

			return -ENOMEM;
@@ -527,15 +527,14 @@ static int ttm_mem_global_alloc_zone(struct ttm_mem_global *glob, 
}



int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,

			 bool no_wait, bool interruptible)

			 struct ttm_operation_ctx *ctx)

{

	/**

	 * Normal allocations of kernel memory are registered in

	 * all zones.

	 */



	return ttm_mem_global_alloc_zone(glob, NULL, memory, no_wait,

					 interruptible);

	return ttm_mem_global_alloc_zone(glob, NULL, memory, ctx);

}

EXPORT_SYMBOL(ttm_mem_global_alloc);
@@ -544,6 +543,10 @@ int ttm_mem_global_alloc_page(struct ttm_mem_global *glob, 
{



	struct ttm_mem_zone *zone = NULL;

	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false

	};



	/**

	 * Page allocations may be registed in a single zone
@@ -557,7 +560,7 @@ int ttm_mem_global_alloc_page(struct ttm_mem_global *glob, 
	if (glob->zone_dma32 && page_to_pfn(page) > 0x00100000UL)

		zone = glob->zone_kernel;

#endif

	return ttm_mem_global_alloc_zone(glob, zone, size, false, false);

	return ttm_mem_global_alloc_zone(glob, zone, size, &ctx);

}



void ttm_mem_global_free_page(struct ttm_mem_global *glob, struct page *page,

drivers/gpu/drm/ttm/ttm_object.c

+10 −3
Original line number Diff line number Diff line
@@ -325,6 +325,10 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, 
	struct ttm_ref_object *ref;

	struct drm_hash_item *hash;

	struct ttm_mem_global *mem_glob = tfile->tdev->mem_glob;

	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false

	};

	int ret = -EINVAL;



	if (base->tfile != tfile && !base->shareable)
@@ -350,7 +354,7 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, 
			return -EPERM;



		ret = ttm_mem_global_alloc(mem_glob, sizeof(*ref),

					   false, false);

					   &ctx);

		if (unlikely(ret != 0))

			return ret;

		ref = kmalloc(sizeof(*ref), GFP_KERNEL);
@@ -686,7 +690,10 @@ int ttm_prime_handle_to_fd(struct ttm_object_file *tfile, 
	dma_buf = prime->dma_buf;

	if (!dma_buf || !get_dma_buf_unless_doomed(dma_buf)) {

		DEFINE_DMA_BUF_EXPORT_INFO(exp_info);



		struct ttm_operation_ctx ctx = {

			.interruptible = true,

			.no_wait_gpu = false

		};

		exp_info.ops = &tdev->ops;

		exp_info.size = prime->size;

		exp_info.flags = flags;
@@ -696,7 +703,7 @@ int ttm_prime_handle_to_fd(struct ttm_object_file *tfile, 
		 * Need to create a new dma_buf, with memory accounting.

		 */

		ret = ttm_mem_global_alloc(tdev->mem_glob, tdev->dma_buf_size,

					   false, true);

					   &ctx);

		if (unlikely(ret != 0)) {

			mutex_unlock(&prime->mutex);

			goto out_unref;

drivers/gpu/drm/vmwgfx/vmwgfx_binding.c

+5 −1
Original line number Diff line number Diff line
@@ -1202,10 +1202,14 @@ struct vmw_ctx_binding_state * 
vmw_binding_state_alloc(struct vmw_private *dev_priv)

{

	struct vmw_ctx_binding_state *cbs;

	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false

	};

	int ret;



	ret = ttm_mem_global_alloc(vmw_mem_glob(dev_priv), sizeof(*cbs),

				   false, false);

				&ctx);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

+10 −3
Original line number Diff line number Diff line
@@ -394,6 +394,10 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt) 
	struct vmw_private *dev_priv = vmw_tt->dev_priv;

	struct ttm_mem_global *glob = vmw_mem_glob(dev_priv);

	struct vmw_sg_table *vsgt = &vmw_tt->vsgt;

	struct ttm_operation_ctx ctx = {

		.interruptible = true,

		.no_wait_gpu = false

	};

	struct vmw_piter iter;

	dma_addr_t old;

	int ret = 0;
@@ -417,8 +421,7 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt) 
			sgt_size = ttm_round_pot(sizeof(struct sg_table));

		}

		vmw_tt->sg_alloc_size = sgt_size + sgl_size * vsgt->num_pages;

		ret = ttm_mem_global_alloc(glob, vmw_tt->sg_alloc_size, false,

					   true);

		ret = ttm_mem_global_alloc(glob, vmw_tt->sg_alloc_size, &ctx);

		if (unlikely(ret != 0))

			return ret;
@@ -638,6 +641,10 @@ static int vmw_ttm_populate(struct ttm_tt *ttm) 
		container_of(ttm, struct vmw_ttm_tt, dma_ttm.ttm);

	struct vmw_private *dev_priv = vmw_tt->dev_priv;

	struct ttm_mem_global *glob = vmw_mem_glob(dev_priv);

	struct ttm_operation_ctx ctx = {

		.interruptible = true,

		.no_wait_gpu = false

	};

	int ret;



	if (ttm->state != tt_unpopulated)
@@ -646,7 +653,7 @@ static int vmw_ttm_populate(struct ttm_tt *ttm) 
	if (dev_priv->map_mode == vmw_dma_alloc_coherent) {

		size_t size =

			ttm_round_pot(ttm->num_pages * sizeof(dma_addr_t));

		ret = ttm_mem_global_alloc(glob, size, false, true);

		ret = ttm_mem_global_alloc(glob, size, &ctx);

		if (unlikely(ret != 0))

			return ret;