drm/nouveau: stop using dma_resv_excl_fence

Instead use the new dma_resv_get_singleton function.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: nouveau@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20220321135856.1331-6-christian.koenig@amd.com

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index fa73fe5..74f8652 100644 (file)
--- 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;