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

[Christian König]

Instead use the new dma_resv_get_singleton function.

Signed-off-by: Christian König <christian.koe...@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;
-- 
2.25.1