drm/nouveau: export reservation_object from dmabuf to ttm

Adds an extra argument to nouveau_bo_new, which is only used in nouveau_prime.c.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 2215cdba587d..228226ab27fc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -61,13 +61,16 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,
                                                          struct sg_table *sg)
 {
         struct nouveau_bo *nvbo;
+        struct reservation_object *robj = attach->dmabuf->resv;
         u32 flags = 0;
         int ret;
 
         flags = TTM_PL_FLAG_TT;
 
+        ww_mutex_lock(&robj->lock, NULL);
         ret = nouveau_bo_new(dev, attach->dmabuf->size, 0, flags, 0, 0,
-                             sg, &nvbo);
+                             sg, robj, &nvbo);
+        ww_mutex_unlock(&robj->lock);
         if (ret)
                 return ERR_PTR(ret);