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

dma-buf: add DMA_RESV_USAGE_KERNEL v3 



Add an usage for kernel submissions. Waiting for those are mandatory for
dynamic DMA-bufs.

As a precaution this patch also changes all occurrences where fences are
added as part of memory management in TTM, VMWGFX and i915 to use the
new value because it now becomes possible for drivers to ignore fences
with the WRITE usage.

v2: use "must" in documentation, fix whitespaces
v3: separate out some driver changes and better document why some
    changes should still be part of this patch.

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/msgid/20220407085946.744568-5-christian.koenig@amd.com
parent 047a1b87

drivers/dma-buf/dma-resv.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ EXPORT_SYMBOL_GPL(dma_resv_test_signaled); 
 */

void dma_resv_describe(struct dma_resv *obj, struct seq_file *seq)

{

	static const char *usage[] = { "write", "read" };

	static const char *usage[] = { "kernel", "write", "read" };

	struct dma_resv_iter cursor;

	struct dma_fence *fence;

drivers/dma-buf/st-dma-resv.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int dma_resv(void) 
	int r;



	spin_lock_init(&fence_lock);

	for (usage = DMA_RESV_USAGE_WRITE; usage <= DMA_RESV_USAGE_READ;

	for (usage = DMA_RESV_USAGE_KERNEL; usage <= DMA_RESV_USAGE_READ;

	     ++usage) {

		r = subtests(tests, (void *)(unsigned long)usage);

		if (r)

drivers/gpu/drm/i915/gem/i915_gem_clflush.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ bool i915_gem_clflush_object(struct drm_i915_gem_object *obj, 
						i915_fence_timeout(i915),

						I915_FENCE_GFP);

		dma_resv_add_fence(obj->base.resv, &clflush->base.dma,

				   DMA_RESV_USAGE_WRITE);

				   DMA_RESV_USAGE_KERNEL);

		dma_fence_work_commit(&clflush->base);

		/*

		 * We must have successfully populated the pages(since we are

drivers/gpu/drm/ttm/ttm_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, 
		return ret;

	}



	dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_WRITE);

	dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_KERNEL);



	ret = dma_resv_reserve_fences(bo->base.resv, 1);

	if (unlikely(ret)) {

drivers/gpu/drm/ttm/ttm_bo_util.c

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int ttm_bo_move_to_ghost(struct ttm_buffer_object *bo, 
		return ret;



	dma_resv_add_fence(&ghost_obj->base._resv, fence,

			   DMA_RESV_USAGE_WRITE);

			   DMA_RESV_USAGE_KERNEL);



	/**

	 * If we're not moving to fixed memory, the TTM object
@@ -562,7 +562,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 
	struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);

	int ret = 0;



	dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_WRITE);

	dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_KERNEL);

	if (!evict)

		ret = ttm_bo_move_to_ghost(bo, fence, man->use_tt);

	else if (!from->use_tt && pipeline)