drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence

This will ensure we always hold the required lock when calling those functions.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 0591ca0734e3..ed966f51e29b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1463,6 +1463,8 @@ nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence)
         struct nouveau_fence *new_fence = nouveau_fence_ref(fence);
         struct nouveau_fence *old_fence = NULL;
 
+        lockdep_assert_held(&nvbo->bo.resv->lock.base);
+
         spin_lock(&nvbo->bo.bdev->fence_lock);
         old_fence = nvbo->bo.sync_obj;
         nvbo->bo.sync_obj = new_fence;