diff options
| author | Christian König <[email protected]> | 2021-11-03 09:29:41 +0000 |
|---|---|---|
| committer | Christian König <[email protected]> | 2022-04-05 07:29:24 +0000 |
| commit | 756cc94d15fae4aaaf55dc131b098c0e5221db11 (patch) | |
| tree | a1b76ab2e99729439bbcff2057bffdf30a8529f9 | |
| parent | drm/nouveau/clk: Fix an incorrect NULL check on list iterator (diff) | |
| download | kernel-756cc94d15fae4aaaf55dc131b098c0e5221db11.tar.gz kernel-756cc94d15fae4aaaf55dc131b098c0e5221db11.zip | |
drm/nouveau: stop using dma_resv_excl_fence
Instead use the new dma_resv_get_singleton function.
Signed-off-by: Christian König <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]>
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: [email protected]
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 9 |
1 files changed, 8 insertions, 1 deletions
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; |