drm/nouveau/prime: Extend DMA reservation object lock

[linux.git] / drivers / gpu / drm / nouveau / nouveau_prime.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index e86ad7ae622bb1f1d56b2c32a80206f5b3006d7a..bae6a3eccee0b284c996c7f43b283b48aa51e835 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -22,7 +22,6 @@
  * Authors: Dave Airlie
  */
 
-#include <drm/drmP.h>
 #include <linux/dma-buf.h>
 
 #include "nouveau_drv.h"
@@ -61,31 +60,46 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,
                                                         struct sg_table *sg)
 {
        struct nouveau_drm *drm = nouveau_drm(dev);
+       struct drm_gem_object *obj;
        struct nouveau_bo *nvbo;
-       struct reservation_object *robj = attach->dmabuf->resv;
+       struct dma_resv *robj = attach->dmabuf->resv;
+       u64 size = attach->dmabuf->size;
        u32 flags = 0;
+       int align = 0;
        int ret;
 
        flags = TTM_PL_FLAG_TT;
 
-       reservation_object_lock(robj, NULL);
-       ret = nouveau_bo_new(&drm->client, attach->dmabuf->size, 0, flags, 0, 0,
-                            sg, robj, &nvbo);
-       reservation_object_unlock(robj);
-       if (ret)
-               return ERR_PTR(ret);
+       dma_resv_lock(robj, NULL);
+       nvbo = nouveau_bo_alloc(&drm->client, &size, &align, flags, 0, 0);
+       if (IS_ERR(nvbo)) {
+               obj = ERR_CAST(nvbo);
+               goto unlock;
+       }
 
        nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_GART;
 
        /* Initialize the embedded gem-object. We return a single gem-reference
         * to the caller, instead of a normal nouveau_bo ttm reference. */
-       ret = drm_gem_object_init(dev, &nvbo->bo.base, nvbo->bo.mem.size);
+       ret = drm_gem_object_init(dev, &nvbo->bo.base, size);
+       if (ret) {
+               nouveau_bo_ref(NULL, &nvbo);
+               obj = ERR_PTR(-ENOMEM);
+               goto unlock;
+       }
+
+       ret = nouveau_bo_init(nvbo, size, align, flags, sg, robj);
        if (ret) {
                nouveau_bo_ref(NULL, &nvbo);
-               return ERR_PTR(-ENOMEM);
+               obj = ERR_PTR(ret);
+               goto unlock;
        }
 
-       return &nvbo->bo.base;
+       obj = &nvbo->bo.base;
+
+unlock:
+       dma_resv_unlock(robj);
+       return obj;
 }
 
 int nouveau_gem_prime_pin(struct drm_gem_object *obj)