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

dma-buf: add DMA_RESV_USAGE_BOOKKEEP v3 



Add an usage for submissions independent of implicit sync but still
interesting for memory management.

v2: cleanup the kerneldoc a bit
v3: separate amdgpu changes from this

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-10-christian.koenig@amd.com
parent 61e55c6f

drivers/dma-buf/dma-resv.c

+2 −2
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) 


	list = NULL;



	dma_resv_iter_begin(&cursor, src, DMA_RESV_USAGE_READ);

	dma_resv_iter_begin(&cursor, src, DMA_RESV_USAGE_BOOKKEEP);

	dma_resv_for_each_fence_unlocked(&cursor, f) {



		if (dma_resv_iter_is_restarted(&cursor)) {
@@ -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[] = { "kernel", "write", "read" };

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

	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_KERNEL; usage <= DMA_RESV_USAGE_READ;

	for (usage = DMA_RESV_USAGE_KERNEL; usage <= DMA_RESV_USAGE_BOOKKEEP;

	     ++usage) {

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

		if (r)

drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void amdgpu_pasid_free_delayed(struct dma_resv *resv, 
	struct dma_fence *fence;

	int r;



	r = dma_resv_get_singleton(resv, DMA_RESV_USAGE_READ, &fence);

	r = dma_resv_get_singleton(resv, DMA_RESV_USAGE_BOOKKEEP, &fence);

	if (r)

		goto fallback;
@@ -139,7 +139,7 @@ void amdgpu_pasid_free_delayed(struct dma_resv *resv, 
	/* Not enough memory for the delayed delete, as last resort

	 * block for all the fences to complete.

	 */

	dma_resv_wait_timeout(resv, DMA_RESV_USAGE_READ,

	dma_resv_wait_timeout(resv, DMA_RESV_USAGE_BOOKKEEP,

			      false, MAX_SCHEDULE_TIMEOUT);

	amdgpu_pasid_free(pasid);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static bool amdgpu_mn_invalidate_gfx(struct mmu_interval_notifier *mni, 


	mmu_interval_set_seq(mni, cur_seq);



	r = dma_resv_wait_timeout(bo->tbo.base.resv, DMA_RESV_USAGE_READ,

	r = dma_resv_wait_timeout(bo->tbo.base.resv, DMA_RESV_USAGE_BOOKKEEP,

				  false, MAX_SCHEDULE_TIMEOUT);

	mutex_unlock(&adev->notifier_lock);

	if (r <= 0)

drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync, 
		return -EINVAL;



	/* TODO: Use DMA_RESV_USAGE_READ here */

	dma_resv_for_each_fence(&cursor, resv, DMA_RESV_USAGE_READ, f) {

	dma_resv_for_each_fence(&cursor, resv, DMA_RESV_USAGE_BOOKKEEP, f) {

		dma_fence_chain_for_each(f, f) {

			struct dma_fence *tmp = dma_fence_chain_contained(f);