[07/24] drm/nouveau: stop using dma_resv_excl_fence

Message ID	20211207123411.167006-8-christian.koenig@amd.com
State	New
Headers	show Return-Path: <linux-media-owner@kernel.org> From: " =?utf-8?q?Christian_K=C3=B6nig?= " <ckoenig.leichtzumerken@gmail.com> To: daniel@ffwll.ch, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 07/24] drm/nouveau: stop using dma_resv_excl_fence Date: Tue, 7 Dec 2021 13:33:54 +0100 Message-Id: <20211207123411.167006-8-christian.koenig@amd.com> In-Reply-To: <20211207123411.167006-1-christian.koenig@amd.com> References: <20211207123411.167006-1-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/24] dma-buf: add dma_resv_replace_fences \| expand [01/24] dma-buf: add dma_resv_replace_fences [02/24] dma-buf: finally make the dma_resv_list private [03/24] dma-buf: drop excl_fence parameter from dma_resv_get_fences [04/24] dma-buf: add dma_resv_get_singleton v2 [05/24] RDMA: use dma_resv_wait() instead of extracting the fence [06/24] drm/etnaviv: stop using dma_resv_excl_fence [07/24] drm/nouveau: stop using dma_resv_excl_fence [08/24] drm/vmwgfx: stop using dma_resv_excl_fence [09/24] drm/radeon: stop using dma_resv_excl_fence [10/24] drm/amdgpu: remove excl as shared workarounds [11/24] drm/amdgpu: use dma_resv_for_each_fence for CS workaround [12/24] dma-buf: finally make dma_resv_excl_fence private [13/24] dma-buf: drop the DAG approach for the dma_resv object [14/24] dma-buf/drivers: make reserving a shared slot mandatory v2 [15/24] drm: support more than one write fence in drm_gem_plane_helper_prepare_fb [16/24] drm/nouveau: support more than one write fence in fenv50_wndw_prepare_fb [17/24] drm/amdgpu: use dma_resv_get_singleton in amdgpu_pasid_free_cb [18/24] dma-buf: add enum dma_resv_usage v3 [19/24] dma-buf: specify usage while adding fences to dma_resv obj v2 [20/24] dma-buf: add DMA_RESV_USAGE_KERNEL [21/24] dma-buf: add DMA_RESV_USAGE_BOOKKEEP [22/24] dma-buf: wait for map to complete for static attachments [23/24] amdgpu: remove DMA-buf fence workaround [24/24] drm/ttm: remove bo->moving

Message ID

20211207123411.167006-8-christian.koenig@amd.com

State

New

Headers

From: " =?utf-8?q?Christian_K=C3=B6nig?= "  <ckoenig.leichtzumerken@gmail.com>
To: daniel@ffwll.ch, dri-devel@lists.freedesktop.org,
        linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org
Subject: [PATCH 07/24] drm/nouveau: stop using dma_resv_excl_fence
Date: Tue,  7 Dec 2021 13:33:54 +0100
Message-Id: <20211207123411.167006-8-christian.koenig@amd.com>
In-Reply-To: <20211207123411.167006-1-christian.koenig@amd.com>
References: <20211207123411.167006-1-christian.koenig@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/24] dma-buf: add dma_resv_replace_fences | expand

Commit Message

Christian König Dec. 7, 2021, 12:33 p.m. UTC

Instead use the new dma_resv_get_singleton function.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index fa73fe57f97b..74f8652d2bd3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -959,7 +959,14 @@  nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo,
 {
 	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
 	struct drm_device *dev = drm->dev;
-	struct dma_fence *fence = dma_resv_excl_fence(bo->base.resv);
+	struct dma_fence *fence;
+	int ret;
+
+	/* TODO: This is actually a memory management dependency */
+	ret = dma_resv_get_singleton(bo->base.resv, false, &fence);
+	if (ret)
+		dma_resv_wait_timeout(bo->base.resv, false, false,
+				      MAX_SCHEDULE_TIMEOUT);
 
 	nv10_bo_put_tile_region(dev, *old_tile, fence);
 	*old_tile = new_tile;

[07/24] drm/nouveau: stop using dma_resv_excl_fence

Commit Message

Patch